projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
thermal: exynos: Fix register read in TMU
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
thermal
/
x86_pkg_temp_thermal.c
diff --git
a/drivers/thermal/x86_pkg_temp_thermal.c
b/drivers/thermal/x86_pkg_temp_thermal.c
index 50d1d2cb091a538b02753f81c2a5909a1f8be9d9..7fc919f7da4de1878c7617c0eb46e6a7950b06b6 100644
(file)
--- a/
drivers/thermal/x86_pkg_temp_thermal.c
+++ b/
drivers/thermal/x86_pkg_temp_thermal.c
@@
-164,7
+164,7
@@
err_ret:
return err;
}
return err;
}
-static int sys_get_curr_temp(struct thermal_zone_device *tzd,
unsigned long
*temp)
+static int sys_get_curr_temp(struct thermal_zone_device *tzd,
int
*temp)
{
u32 eax, edx;
struct phy_dev_entry *phy_dev_entry;
{
u32 eax, edx;
struct phy_dev_entry *phy_dev_entry;
@@
-175,7
+175,7
@@
static int sys_get_curr_temp(struct thermal_zone_device *tzd, unsigned long *tem
if (eax & 0x80000000) {
*temp = phy_dev_entry->tj_max -
((eax >> 16) & 0x7f) * 1000;
if (eax & 0x80000000) {
*temp = phy_dev_entry->tj_max -
((eax >> 16) & 0x7f) * 1000;
- pr_debug("sys_get_curr_temp %
l
d\n", *temp);
+ pr_debug("sys_get_curr_temp %d\n", *temp);
return 0;
}
return 0;
}
@@
-183,7
+183,7
@@
static int sys_get_curr_temp(struct thermal_zone_device *tzd, unsigned long *tem
}
static int sys_get_trip_temp(struct thermal_zone_device *tzd,
}
static int sys_get_trip_temp(struct thermal_zone_device *tzd,
- int trip,
unsigned long
*temp)
+ int trip,
int
*temp)
{
u32 eax, edx;
struct phy_dev_entry *phy_dev_entry;
{
u32 eax, edx;
struct phy_dev_entry *phy_dev_entry;
@@
-214,13
+214,13
@@
static int sys_get_trip_temp(struct thermal_zone_device *tzd,
*temp = phy_dev_entry->tj_max - thres_reg_value * 1000;
else
*temp = 0;
*temp = phy_dev_entry->tj_max - thres_reg_value * 1000;
else
*temp = 0;
- pr_debug("sys_get_trip_temp %
l
d\n", *temp);
+ pr_debug("sys_get_trip_temp %d\n", *temp);
return 0;
}
static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip,
return 0;
}
static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip,
-
unsigned long
temp)
+
int
temp)
{
u32 l, h;
struct phy_dev_entry *phy_dev_entry;
{
u32 l, h;
struct phy_dev_entry *phy_dev_entry;