]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hwmon: (max1668) 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>
Sat, 15 Sep 2012 14:57:24 +0000 (07:57 -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/max1668.c

index 335b183d7c022e6d3b7032848558de8b43894aeb..666d9f6263eb462e41a5ec319ca5d29dc67eb540 100644 (file)
@@ -411,7 +411,8 @@ static int max1668_probe(struct i2c_client *client,
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -ENODEV;
 
-       data = kzalloc(sizeof(struct max1668_data), GFP_KERNEL);
+       data = devm_kzalloc(&client->dev, sizeof(struct max1668_data),
+                           GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
@@ -422,7 +423,7 @@ static int max1668_probe(struct i2c_client *client,
        /* Register sysfs hooks */
        err = sysfs_create_group(&client->dev.kobj, &max1668_group_common);
        if (err)
-               goto error_free;
+               return err;
 
        if (data->type == max1668 || data->type == max1989) {
                err = sysfs_create_group(&client->dev.kobj,
@@ -444,8 +445,6 @@ error_sysrem1:
                sysfs_remove_group(&client->dev.kobj, &max1668_group_unique);
 error_sysrem0:
        sysfs_remove_group(&client->dev.kobj, &max1668_group_common);
-error_free:
-       kfree(data);
        return err;
 }
 
@@ -459,7 +458,6 @@ static int max1668_remove(struct i2c_client *client)
 
        sysfs_remove_group(&client->dev.kobj, &max1668_group_common);
 
-       kfree(data);
        return 0;
 }