hwmon: (ltc4151) Convert to use devm_ functions
authorGuenter Roeck <linux@roeck-us.net>
Sat, 2 Jun 2012 17:35:52 +0000 (10:35 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Mon, 24 Sep 2012 04:08:32 +0000 (21:08 -0700)
Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Per Dalen <per.dalen@appeartv.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/ltc4151.c

index 4d005b219de2d4749211652561376da68b8454c2..8496baa08bc8349183e537e4f61e0d2db03c7cd4 100644 (file)
@@ -181,11 +181,9 @@ static int ltc4151_probe(struct i2c_client *client,
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -ENODEV;
 
-       data = kzalloc(sizeof(*data), GFP_KERNEL);
-       if (!data) {
-               ret = -ENOMEM;
-               goto out_kzalloc;
-       }
+       data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
 
        i2c_set_clientdata(client, data);
        mutex_init(&data->update_lock);
@@ -193,7 +191,7 @@ static int ltc4151_probe(struct i2c_client *client,
        /* Register sysfs hooks */
        ret = sysfs_create_group(&client->dev.kobj, &ltc4151_group);
        if (ret)
-               goto out_sysfs_create_group;
+               return ret;
 
        data->hwmon_dev = hwmon_device_register(&client->dev);
        if (IS_ERR(data->hwmon_dev)) {
@@ -205,9 +203,6 @@ static int ltc4151_probe(struct i2c_client *client,
 
 out_hwmon_device_register:
        sysfs_remove_group(&client->dev.kobj, &ltc4151_group);
-out_sysfs_create_group:
-       kfree(data);
-out_kzalloc:
        return ret;
 }
 
@@ -218,8 +213,6 @@ static int ltc4151_remove(struct i2c_client *client)
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &ltc4151_group);
 
-       kfree(data);
-
        return 0;
 }