]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hwmon: (g760a) Convert to use devm_ functions
authorGuenter Roeck <linux@roeck-us.net>
Sat, 2 Jun 2012 16:58:06 +0000 (09:58 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Sat, 15 Sep 2012 14:57:23 +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/g760a.c

index ebcd2698e4dc168f057c5919e51694d551a6a119..8b2106f60edac7e91c4eb6eaabfb2cc6585636a0 100644 (file)
@@ -207,7 +207,8 @@ static int g760a_probe(struct i2c_client *client,
                                     I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
 
-       data = kzalloc(sizeof(struct g760a_data), GFP_KERNEL);
+       data = devm_kzalloc(&client->dev, sizeof(struct g760a_data),
+                           GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
@@ -223,7 +224,7 @@ static int g760a_probe(struct i2c_client *client,
        /* Register sysfs hooks */
        err = sysfs_create_group(&client->dev.kobj, &g760a_group);
        if (err)
-               goto error_sysfs_create_group;
+               return err;
 
        data->hwmon_dev = hwmon_device_register(&client->dev);
        if (IS_ERR(data->hwmon_dev)) {
@@ -235,9 +236,6 @@ static int g760a_probe(struct i2c_client *client,
 
 error_hwmon_device_register:
        sysfs_remove_group(&client->dev.kobj, &g760a_group);
-error_sysfs_create_group:
-       kfree(data);
-
        return err;
 }
 
@@ -246,8 +244,6 @@ static int g760a_remove(struct i2c_client *client)
        struct g760a_data *data = i2c_get_clientdata(client);
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &g760a_group);
-       kfree(data);
-
        return 0;
 }