]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hwmon: (adt7470) Convert to use devm_ functions
authorGuenter Roeck <linux@roeck-us.net>
Sat, 2 Jun 2012 16:58:01 +0000 (09:58 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Sat, 18 Aug 2012 23:34:59 +0000 (16:34 -0700)
Convert to use devm_ functions to reduce code size and simplify the code.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/adt7470.c

index 54ec890521ff31ad0f5d273e3315c22bec2734b6..39ecb1a3b9ef61982b0e81e9fbac5585da35dfac 100644 (file)
@@ -1256,11 +1256,10 @@ static int adt7470_probe(struct i2c_client *client,
        struct adt7470_data *data;
        int err;
 
-       data = kzalloc(sizeof(struct adt7470_data), GFP_KERNEL);
-       if (!data) {
-               err = -ENOMEM;
-               goto exit;
-       }
+       data = devm_kzalloc(&client->dev, sizeof(struct adt7470_data),
+                           GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
 
        data->num_temp_sensors = -1;
        data->auto_update_interval = AUTO_UPDATE_INTERVAL;
@@ -1277,7 +1276,7 @@ static int adt7470_probe(struct i2c_client *client,
        data->attrs.attrs = adt7470_attr;
        err = sysfs_create_group(&client->dev.kobj, &data->attrs);
        if (err)
-               goto exit_free;
+               return err;
 
        data->hwmon_dev = hwmon_device_register(&client->dev);
        if (IS_ERR(data->hwmon_dev)) {
@@ -1299,9 +1298,6 @@ exit_unregister:
        hwmon_device_unregister(data->hwmon_dev);
 exit_remove:
        sysfs_remove_group(&client->dev.kobj, &data->attrs);
-exit_free:
-       kfree(data);
-exit:
        return err;
 }
 
@@ -1313,7 +1309,6 @@ static int adt7470_remove(struct i2c_client *client)
        wait_for_completion(&data->auto_update_stop);
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &data->attrs);
-       kfree(data);
        return 0;
 }