openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwmon: (thmc50) 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>
This commit is contained in:
Guenter Roeck 2012-06-02 11:20:23 -07:00
parent 5d224ade31
commit bd91d3bab8
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/hwmon/thmc50.c
View File

@ -361,12 +361,10 @@ static int thmc50_probe(struct i2c_client *client,
struct thmc50_data *data; struct thmc50_data *data;
int err; int err;
data = kzalloc(sizeof(struct thmc50_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct thmc50_data),
if (!data) { GFP_KERNEL);
pr_debug("thmc50: detect failed, kzalloc failed!\n"); if (!data)
err = -ENOMEM; return -ENOMEM;
goto exit;
}
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
data->type = id->driver_data; data->type = id->driver_data;
@ -377,7 +375,7 @@ static int thmc50_probe(struct i2c_client *client,
/* Register sysfs hooks */ /* Register sysfs hooks */
err = sysfs_create_group(&client->dev.kobj, &thmc50_group); err = sysfs_create_group(&client->dev.kobj, &thmc50_group);
if (err) if (err)
goto exit_free; return err;
/* Register ADM1022 sysfs hooks */ /* Register ADM1022 sysfs hooks */
if (data->has_temp3) { if (data->has_temp3) {
@ -400,9 +398,6 @@ static int thmc50_probe(struct i2c_client *client,
sysfs_remove_group(&client->dev.kobj, &temp3_group); sysfs_remove_group(&client->dev.kobj, &temp3_group);
exit_remove_sysfs_thmc50: exit_remove_sysfs_thmc50:
sysfs_remove_group(&client->dev.kobj, &thmc50_group); sysfs_remove_group(&client->dev.kobj, &thmc50_group);
exit_free:
kfree(data);
exit:
return err; return err;
} }
@ -415,8 +410,6 @@ static int thmc50_remove(struct i2c_client *client)
if (data->has_temp3) if (data->has_temp3)
sysfs_remove_group(&client->dev.kobj, &temp3_group); sysfs_remove_group(&client->dev.kobj, &temp3_group);
kfree(data);
return 0; return 0;
} }