These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / thermal / st / st_thermal.c

diff --git a/kernel/drivers/thermal/st/st_thermal.c b/kernel/drivers/thermal/st/st_thermal.c
index 76c515d..be637e6 100644 (file)
--- a/kernel/drivers/thermal/st/st_thermal.c
+++ b/kernel/drivers/thermal/st/st_thermal.c
@@ -111,8 +111,7 @@ static int st_thermal_calibration(struct st_thermal_sensor *sensor)
 }
 
 /* Callback to get temperature from HW*/
-static int st_thermal_get_temp(struct thermal_zone_device *th,
-               unsigned long *temperature)
+static int st_thermal_get_temp(struct thermal_zone_device *th, int *temperature)
 {
        struct st_thermal_sensor *sensor = th->devdata;
        struct device *dev = sensor->dev;
@@ -159,7 +158,7 @@ static int st_thermal_get_trip_type(struct thermal_zone_device *th,
 }
 
 static int st_thermal_get_trip_temp(struct thermal_zone_device *th,
-                                   int trip, unsigned long *temp)
+                                   int trip, int *temp)
 {
        struct st_thermal_sensor *sensor = th->devdata;
        struct device *dev = sensor->dev;
@@ -214,7 +213,7 @@ int st_thermal_register(struct platform_device *pdev,
 
        sensor->ops = sensor->cdata->ops;
 
-       ret = sensor->ops->regmap_init(sensor);
+       ret = (sensor->ops->regmap_init)(sensor);
        if (ret)
                return ret;