diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 11:35:53 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-07-21 21:48:42 -0700 |
| commit | f625e0fd513fa12cfabec9ed19f71a9bd7dd60e1 (patch) | |
| tree | 20ff4e4806e2f446e6b528910611251dc72d244e /drivers/hwmon/tmp421.c | |
| parent | 0df9fc7bb8ced5e6fc16a0141d2ee8f6f0eea61c (diff) | |
hwmon: (tmp421) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon/tmp421.c')
| -rw-r--r-- | drivers/hwmon/tmp421.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c index 8fac87a38544..6a8ded29f1ed 100644 --- a/drivers/hwmon/tmp421.c +++ b/drivers/hwmon/tmp421.c @@ -267,7 +267,8 @@ static int tmp421_probe(struct i2c_client *client, struct tmp421_data *data; int err; - data = kzalloc(sizeof(struct tmp421_data), GFP_KERNEL); + data = devm_kzalloc(&client->dev, sizeof(struct tmp421_data), + GFP_KERNEL); if (!data) return -ENOMEM; @@ -277,11 +278,11 @@ static int tmp421_probe(struct i2c_client *client, err = tmp421_init_client(client); if (err) - goto exit_free; + return err; err = sysfs_create_group(&client->dev.kobj, &tmp421_group); if (err) - goto exit_free; + return err; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -293,10 +294,6 @@ static int tmp421_probe(struct i2c_client *client, exit_remove: sysfs_remove_group(&client->dev.kobj, &tmp421_group); - -exit_free: - kfree(data); - return err; } @@ -307,8 +304,6 @@ static int tmp421_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &tmp421_group); - kfree(data); - return 0; } |