Merge branch 'eduardo-soc-thermal' into thermal-soc

3 files changed, 16 insertions, 5 deletions

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index d16dbb33a531..e7c8bf9093ea 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -176,6 +176,10 @@ static struct attribute *lm75_attrs[] = {
 };
 ATTRIBUTE_GROUPS(lm75);
 
+static const struct thermal_zone_of_device_ops lm75_of_thermal_ops = {
+        .get_temp = lm75_read_temp,
+};
+
 /*-----------------------------------------------------------------------*/
 
 /* device probe and removal */
@@ -291,10 +295,9 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
         if (IS_ERR(data->hwmon_dev))
                 return PTR_ERR(data->hwmon_dev);
 
-        data->tz = thermal_zone_of_sensor_register(data->hwmon_dev,
-                                                   0,
+        data->tz = thermal_zone_of_sensor_register(data->hwmon_dev, 0,
                                                    data->hwmon_dev,
-                                                   lm75_read_temp, NULL);
+                                                   &lm75_of_thermal_ops);
         if (IS_ERR(data->tz))
                 data->tz = NULL;
 
diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c
index 4ff89b2482e4..bca8521c8a9b 100644
--- a/drivers/hwmon/ntc_thermistor.c
+++ b/drivers/hwmon/ntc_thermistor.c
@@ -486,6 +486,10 @@ static const struct attribute_group ntc_attr_group = {
         .attrs = ntc_attributes,
 };
 
+static const struct thermal_zone_of_device_ops ntc_of_thermal_ops = {
+        .get_temp = ntc_read_temp,
+};
+
 static int ntc_thermistor_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id =
@@ -579,7 +583,7 @@ static int ntc_thermistor_probe(struct platform_device *pdev)
                                                                 pdev_id->name);
 
         data->tz = thermal_zone_of_sensor_register(data->dev, 0, data->dev,
-                                                ntc_read_temp, NULL);
+                                                   &ntc_of_thermal_ops);
         if (IS_ERR(data->tz)) {
                 dev_dbg(&pdev->dev, "Failed to register to thermal fw.\n");
                 data->tz = NULL;
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 51719956cc03..ba9f478f64ee 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -158,6 +158,10 @@ ATTRIBUTE_GROUPS(tmp102);
 #define TMP102_CONFIG  (TMP102_CONF_TM | TMP102_CONF_EM | TMP102_CONF_CR1)
 #define TMP102_CONFIG_RD_ONLY (TMP102_CONF_R0 | TMP102_CONF_R1 | TMP102_CONF_AL)
 
+static const struct thermal_zone_of_device_ops tmp102_of_thermal_ops = {
+        .get_temp = tmp102_read_temp,
+};
+
 static int tmp102_probe(struct i2c_client *client,
                                   const struct i2c_device_id *id)
 {
@@ -215,7 +219,7 @@ static int tmp102_probe(struct i2c_client *client,
         }
         tmp102->hwmon_dev = hwmon_dev;
         tmp102->tz = thermal_zone_of_sensor_register(hwmon_dev, 0, hwmon_dev,
-                                                     tmp102_read_temp, NULL);
+                                                     &tmp102_of_thermal_ops);
         if (IS_ERR(tmp102->tz))
                 tmp102->tz = NULL;