Merge tag 'for-linus-4.7b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / hwmon / tmp102.c

diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 5289aa0980a8fac074822ddb412f35e7a9380bd5..f1e96fd7f445bff92965c286b188a2ec253b0813 100644 (file)
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -53,7 +53,6 @@
 struct tmp102 {
        struct i2c_client *client;
        struct device *hwmon_dev;
-       struct thermal_zone_device *tz;
        struct mutex lock;
        u16 config_orig;
        unsigned long last_update;
@@ -232,10 +231,8 @@ static int tmp102_probe(struct i2c_client *client,
                goto fail_restore_config;
        }
        tmp102->hwmon_dev = hwmon_dev;
-       tmp102->tz = thermal_zone_of_sensor_register(hwmon_dev, 0, hwmon_dev,
-                                                    &tmp102_of_thermal_ops);
-       if (IS_ERR(tmp102->tz))
-               tmp102->tz = NULL;
+       devm_thermal_zone_of_sensor_register(hwmon_dev, 0, hwmon_dev,
+                                            &tmp102_of_thermal_ops);
 
        dev_info(dev, "initialized\n");
 
@@ -251,7 +248,6 @@ static int tmp102_remove(struct i2c_client *client)
 {
        struct tmp102 *tmp102 = i2c_get_clientdata(client);
 
-       thermal_zone_of_sensor_unregister(tmp102->hwmon_dev, tmp102->tz);
        hwmon_device_unregister(tmp102->hwmon_dev);
 
        /* Stop monitoring if device was stopped originally */