diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 09:57:59 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-07-21 21:48:39 -0700 |
| commit | 3421e212e6dfa6792877ef0b9e7a147ee15a59c0 (patch) | |
| tree | c18912182f7000bf583b43d53a4df454ab7065c6 /drivers/hwmon/adm1026.c | |
| parent | 06ce97d608fb0599509c1c586662ba4778719fc4 (diff) | |
| download | linux-3421e212e6dfa6792877ef0b9e7a147ee15a59c0.tar.gz linux-3421e212e6dfa6792877ef0b9e7a147ee15a59c0.tar.bz2 linux-3421e212e6dfa6792877ef0b9e7a147ee15a59c0.zip | |
hwmon: (adm1026) 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/adm1026.c')
| -rw-r--r-- | drivers/hwmon/adm1026.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c index 1003219b9f90..0f068e7297ee 100644 --- a/drivers/hwmon/adm1026.c +++ b/drivers/hwmon/adm1026.c @@ -1834,11 +1834,10 @@ static int adm1026_probe(struct i2c_client *client, struct adm1026_data *data; int err; - data = kzalloc(sizeof(struct adm1026_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct adm1026_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -1852,7 +1851,7 @@ static int adm1026_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &adm1026_group); if (err) - goto exitfree; + return err; if (data->config1 & CFG1_AIN8_9) err = sysfs_create_group(&client->dev.kobj, &adm1026_group_in8_9); @@ -1877,9 +1876,6 @@ exitremove: sysfs_remove_group(&client->dev.kobj, &adm1026_group_in8_9); else sysfs_remove_group(&client->dev.kobj, &adm1026_group_temp3); -exitfree: - kfree(data); -exit: return err; } @@ -1892,7 +1888,6 @@ static int adm1026_remove(struct i2c_client *client) sysfs_remove_group(&client->dev.kobj, &adm1026_group_in8_9); else sysfs_remove_group(&client->dev.kobj, &adm1026_group_temp3); - kfree(data); return 0; } |