]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
hwmon: (lm95245) Convert to use devm_ functions
authorGuenter Roeck <linux@roeck-us.net>
Sat, 2 Jun 2012 16:58:12 +0000 (09:58 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Mon, 24 Sep 2012 04:08:31 +0000 (21:08 -0700)
Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Alexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/lm95245.c

index 9a46c106a240230db8aaba95870e02447090cb5e..2915fd90836495c16cb4e89485daf5b457b6289b 100644 (file)
@@ -462,11 +462,10 @@ static int lm95245_probe(struct i2c_client *new_client,
        struct lm95245_data *data;
        int err;
 
-       data = kzalloc(sizeof(struct lm95245_data), GFP_KERNEL);
-       if (!data) {
-               err = -ENOMEM;
-               goto exit;
-       }
+       data = devm_kzalloc(&new_client->dev, sizeof(struct lm95245_data),
+                           GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
 
        i2c_set_clientdata(new_client, data);
        mutex_init(&data->update_lock);
@@ -477,7 +476,7 @@ static int lm95245_probe(struct i2c_client *new_client,
        /* Register sysfs hooks */
        err = sysfs_create_group(&new_client->dev.kobj, &lm95245_group);
        if (err)
-               goto exit_free;
+               return err;
 
        data->hwmon_dev = hwmon_device_register(&new_client->dev);
        if (IS_ERR(data->hwmon_dev)) {
@@ -489,9 +488,6 @@ static int lm95245_probe(struct i2c_client *new_client,
 
 exit_remove_files:
        sysfs_remove_group(&new_client->dev.kobj, &lm95245_group);
-exit_free:
-       kfree(data);
-exit:
        return err;
 }
 
@@ -502,7 +498,6 @@ static int lm95245_remove(struct i2c_client *client)
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &lm95245_group);
 
-       kfree(data);
        return 0;
 }