malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

hwmon: (amc6821) Convert to use devm_ functions

Browse Source 
Convert to use devm_ functions to reduce code size and simplify the code.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2012-06-02 09:58:02 -07:00
parent 9cc7dcc523
commit f9286434ea
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/hwmon/amc6821.c
View File

@ -862,12 +862,10 @@ static int amc6821_probe(
struct amc6821_data *data; struct amc6821_data *data;
int err; int err;
data = kzalloc(sizeof(struct amc6821_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct amc6821_data),
if (!data) { GFP_KERNEL);
dev_err(&client->dev, "out of memory.\n"); if (!data)
return -ENOMEM; return -ENOMEM;
}
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
@ -877,11 +875,11 @@ static int amc6821_probe(
*/ */
err = amc6821_init_client(client); err = amc6821_init_client(client);
if (err) if (err)
goto err_free; return err;
err = sysfs_create_group(&client->dev.kobj, &amc6821_attr_grp); err = sysfs_create_group(&client->dev.kobj, &amc6821_attr_grp);
if (err) if (err)
goto err_free; return err;
data->hwmon_dev = hwmon_device_register(&client->dev); data->hwmon_dev = hwmon_device_register(&client->dev);
if (!IS_ERR(data->hwmon_dev)) if (!IS_ERR(data->hwmon_dev))
@ -890,8 +888,6 @@ static int amc6821_probe(
err = PTR_ERR(data->hwmon_dev); err = PTR_ERR(data->hwmon_dev);
dev_err(&client->dev, "error registering hwmon device.\n"); dev_err(&client->dev, "error registering hwmon device.\n");
sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp); sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp);
err_free:
kfree(data);
return err; return err;
} }
@ -902,8 +898,6 @@ static int amc6821_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp); sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp);
kfree(data);
return 0; return 0;
} }