]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hwmon: (ads1015) Convert to use devm_ functions
authorGuenter Roeck <linux@roeck-us.net>
Sat, 2 Jun 2012 16:58:00 +0000 (09:58 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Wed, 19 Sep 2012 13:51:34 +0000 (06:51 -0700)
Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/ads1015.c

index 1958f03efd7aaa43f72416f809eb42fe569b413f..2798246ad81470988fadd920dee5e9282f463445 100644 (file)
@@ -156,7 +156,6 @@ static int ads1015_remove(struct i2c_client *client)
        hwmon_device_unregister(data->hwmon_dev);
        for (k = 0; k < ADS1015_CHANNELS; ++k)
                device_remove_file(&client->dev, &ads1015_in[k].dev_attr);
-       kfree(data);
        return 0;
 }
 
@@ -254,11 +253,10 @@ static int ads1015_probe(struct i2c_client *client,
        int err;
        unsigned int k;
 
-       data = kzalloc(sizeof(struct ads1015_data), GFP_KERNEL);
-       if (!data) {
-               err = -ENOMEM;
-               goto exit;
-       }
+       data = devm_kzalloc(&client->dev, sizeof(struct ads1015_data),
+                           GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
 
        i2c_set_clientdata(client, data);
        mutex_init(&data->update_lock);
@@ -284,8 +282,6 @@ static int ads1015_probe(struct i2c_client *client,
 exit_remove:
        for (k = 0; k < ADS1015_CHANNELS; ++k)
                device_remove_file(&client->dev, &ads1015_in[k].dev_attr);
-       kfree(data);
-exit:
        return err;
 }