drm: arc: Rely on the default ->best_encoder() behavior

[deliverable/linux.git] / drivers / hwmon / lm75.c

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 0addc84ba948a09e6b740db56593fbd124b8c8d5..69166ab3151d52db66421ad353082fd57cf4cf3d 100644 (file)
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -77,7 +77,6 @@ static const u8 LM75_REG_TEMP[3] = {
 struct lm75_data {
        struct i2c_client       *client;
        struct device           *hwmon_dev;
-       struct thermal_zone_device      *tz;
        struct mutex            update_lock;
        u8                      orig_conf;
        u8                      resolution;     /* In bits, between 9 and 12 */
@@ -306,11 +305,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->hwmon_dev,
-                                                  &lm75_of_thermal_ops);
-       if (IS_ERR(data->tz))
-               data->tz = NULL;
+       devm_thermal_zone_of_sensor_register(data->hwmon_dev, 0,
+                                            data->hwmon_dev,
+                                            &lm75_of_thermal_ops);
 
        dev_info(dev, "%s: sensor '%s'\n",
                 dev_name(data->hwmon_dev), client->name);
@@ -322,7 +319,6 @@ static int lm75_remove(struct i2c_client *client)
 {
        struct lm75_data *data = i2c_get_clientdata(client);
 
-       thermal_zone_of_sensor_unregister(data->hwmon_dev, data->tz);
        hwmon_device_unregister(data->hwmon_dev);
        lm75_write_value(client, LM75_REG_CONF, data->orig_conf);
        return 0;