]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hwmon: (ltc4245) 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>
Wed, 12 Sep 2012 13:42:59 +0000 (06:42 -0700)
Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/ltc4245.c

index b99b45bafdad4d501e285c3d8b7cb1542a70477e..52075914eb0bb1adb7a225a9f500de3869b4a125 100644 (file)
@@ -519,11 +519,9 @@ static int ltc4245_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);
@@ -536,7 +534,7 @@ static int ltc4245_probe(struct i2c_client *client,
        /* Register sysfs hooks */
        ret = ltc4245_sysfs_create_groups(client);
        if (ret)
-               goto out_sysfs_create_groups;
+               return ret;
 
        data->hwmon_dev = hwmon_device_register(&client->dev);
        if (IS_ERR(data->hwmon_dev)) {
@@ -548,9 +546,6 @@ static int ltc4245_probe(struct i2c_client *client,
 
 out_hwmon_device_register:
        ltc4245_sysfs_remove_groups(client);
-out_sysfs_create_groups:
-       kfree(data);
-out_kzalloc:
        return ret;
 }
 
@@ -560,7 +555,6 @@ static int ltc4245_remove(struct i2c_client *client)
 
        hwmon_device_unregister(data->hwmon_dev);
        ltc4245_sysfs_remove_groups(client);
-       kfree(data);
 
        return 0;
 }