diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-11 20:06:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-11 20:06:59 -0700
commitdfb22fc5c0eb7645f47a752ce537bfb2c8a6aea6 (patch)
parent01b0c014eeb0bb857a5dc572cd108be7becddfe7 (diff)
thermal: fix intel PCH thermal driver mismerge
I didn't notice this when merging the thermal code from Zhang, but his merge (commit 5a924a07f882: "Merge branches 'thermal-core' and 'thermal-intel' of .git into next") of the thermal-core and thermal-intel branches was wrong. In thermal-core, commit 17e8351a7739 ("thermal: consistently use int for temperatures") converted the thermal layer to use "int" for temperatures. But in parallel, in the thermal-intel branch commit d0a12625d2ff ("thermal: Add Intel PCH thermal driver") added support for the intel PCH thermal sensor using the old interfaces that used "unsigned long" pointers. This resulted in warnings like this: drivers/thermal/intel_pch_thermal.c:184:14: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .get_temp = pch_thermal_get_temp, ^ drivers/thermal/intel_pch_thermal.c:184:14: note: (near initialization for ‘tzd_ops.get_temp’) drivers/thermal/intel_pch_thermal.c:186:19: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .get_trip_temp = pch_get_trip_temp, ^ drivers/thermal/intel_pch_thermal.c:186:19: note: (near initialization for ‘tzd_ops.get_trip_temp’) This fixes it. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/thermal/intel_pch_thermal.c b/drivers/thermal/intel_pch_thermal.c
index 1650a62484bd..50c7da79be83 100644
--- a/drivers/thermal/intel_pch_thermal.c
+++ b/drivers/thermal/intel_pch_thermal.c
@@ -117,8 +117,7 @@ read_trips:
return 0;
-static int pch_wpt_get_temp(struct pch_thermal_device *ptd,
- unsigned long *temp)
+static int pch_wpt_get_temp(struct pch_thermal_device *ptd, int *temp)
u8 wpt_temp;
@@ -132,7 +131,7 @@ static int pch_wpt_get_temp(struct pch_thermal_device *ptd,
struct pch_dev_ops {
int (*hw_init)(struct pch_thermal_device *ptd, int *nr_trips);
- int (*get_temp)(struct pch_thermal_device *ptd, unsigned long *temp);
+ int (*get_temp)(struct pch_thermal_device *ptd, int *temp);
@@ -142,8 +141,7 @@ static struct pch_dev_ops pch_dev_ops_wpt = {
.get_temp = pch_wpt_get_temp,
-static int pch_thermal_get_temp(struct thermal_zone_device *tzd,
- unsigned long *temp)
+static int pch_thermal_get_temp(struct thermal_zone_device *tzd, int *temp)
struct pch_thermal_device *ptd = tzd->devdata;
@@ -165,8 +163,7 @@ static int pch_get_trip_type(struct thermal_zone_device *tzd, int trip,
return 0;
-static int pch_get_trip_temp(struct thermal_zone_device *tzd, int trip,
- unsigned long *temp)
+static int pch_get_trip_temp(struct thermal_zone_device *tzd, int trip, int *temp)
struct pch_thermal_device *ptd = tzd->devdata;