]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hwmon: (f75375s) Convert to use devm_ functions
authorGuenter Roeck <linux@roeck-us.net>
Sat, 2 Jun 2012 16:58:05 +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.

Cc: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/f75375s.c

index ece4159bd4536553abafed0689d60d71f361d312..f7dba229395f9a844da9a8418ac9c5b2918d75dd 100644 (file)
@@ -838,7 +838,8 @@ static int f75375_probe(struct i2c_client *client,
        if (!i2c_check_functionality(client->adapter,
                                I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
-       data = kzalloc(sizeof(struct f75375_data), GFP_KERNEL);
+       data = devm_kzalloc(&client->dev, sizeof(struct f75375_data),
+                           GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
@@ -848,7 +849,7 @@ static int f75375_probe(struct i2c_client *client,
 
        err = sysfs_create_group(&client->dev.kobj, &f75375_group);
        if (err)
-               goto exit_free;
+               return err;
 
        if (data->kind != f75373) {
                err = sysfs_chmod_file(&client->dev.kobj,
@@ -875,8 +876,6 @@ static int f75375_probe(struct i2c_client *client,
 
 exit_remove:
        sysfs_remove_group(&client->dev.kobj, &f75375_group);
-exit_free:
-       kfree(data);
        return err;
 }
 
@@ -885,7 +884,6 @@ static int f75375_remove(struct i2c_client *client)
        struct f75375_data *data = i2c_get_clientdata(client);
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &f75375_group);
-       kfree(data);
        return 0;
 }