From 906ab5c746d34e67763f7083794582c3a4d5f0fd Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 8 Dec 2015 17:32:16 +0000 Subject: [PATCH] fixup! Added hwmon/thermal driver for reporting core temperature. Thanks Dorian --- drivers/thermal/bcm2835-thermal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/bcm2835-thermal.c b/drivers/thermal/bcm2835-thermal.c index c1d8f1b5224ba..08d8dc7c5d005 100644 --- a/drivers/thermal/bcm2835-thermal.c +++ b/drivers/thermal/bcm2835-thermal.c @@ -18,7 +18,7 @@ #include static int bcm2835_thermal_get_property(struct thermal_zone_device *tz, - unsigned long *temp, u32 tag) + int *temp, u32 tag) { struct rpi_firmware *fw = tz->devdata; struct { @@ -36,21 +36,21 @@ static int bcm2835_thermal_get_property(struct thermal_zone_device *tz, } *temp = packet.val; - dev_dbg(&tz->device, "%stemp=%lu\n", + dev_dbg(&tz->device, "%stemp=%d\n", tag == RPI_FIRMWARE_GET_MAX_TEMPERATURE ? "max" : "", *temp); return 0; } static int bcm2835_thermal_get_temp(struct thermal_zone_device *tz, - unsigned long *temp) + int *temp) { return bcm2835_thermal_get_property(tz, temp, RPI_FIRMWARE_GET_TEMPERATURE); } static int bcm2835_thermal_get_max_temp(struct thermal_zone_device *tz, - int trip, unsigned long *temp) + int trip, int *temp) { /* * The maximum safe temperature of the SoC.