mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
hwmon: (pcf8591) 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:
parent
96f316c24c
commit
60c2b56975
@ -200,11 +200,10 @@ static int pcf8591_probe(struct i2c_client *client,
|
|||||||
struct pcf8591_data *data;
|
struct pcf8591_data *data;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
data = kzalloc(sizeof(struct pcf8591_data), GFP_KERNEL);
|
data = devm_kzalloc(&client->dev, sizeof(struct pcf8591_data),
|
||||||
if (!data) {
|
GFP_KERNEL);
|
||||||
err = -ENOMEM;
|
if (!data)
|
||||||
goto exit;
|
return -ENOMEM;
|
||||||
}
|
|
||||||
|
|
||||||
i2c_set_clientdata(client, data);
|
i2c_set_clientdata(client, data);
|
||||||
mutex_init(&data->update_lock);
|
mutex_init(&data->update_lock);
|
||||||
@ -215,7 +214,7 @@ static int pcf8591_probe(struct i2c_client *client,
|
|||||||
/* Register sysfs hooks */
|
/* Register sysfs hooks */
|
||||||
err = sysfs_create_group(&client->dev.kobj, &pcf8591_attr_group);
|
err = sysfs_create_group(&client->dev.kobj, &pcf8591_attr_group);
|
||||||
if (err)
|
if (err)
|
||||||
goto exit_kfree;
|
return err;
|
||||||
|
|
||||||
/* Register input2 if not in "two differential inputs" mode */
|
/* Register input2 if not in "two differential inputs" mode */
|
||||||
if (input_mode != 3) {
|
if (input_mode != 3) {
|
||||||
@ -242,9 +241,6 @@ static int pcf8591_probe(struct i2c_client *client,
|
|||||||
exit_sysfs_remove:
|
exit_sysfs_remove:
|
||||||
sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group_opt);
|
sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group_opt);
|
||||||
sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group);
|
sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group);
|
||||||
exit_kfree:
|
|
||||||
kfree(data);
|
|
||||||
exit:
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -255,7 +251,6 @@ static int pcf8591_remove(struct i2c_client *client)
|
|||||||
hwmon_device_unregister(data->hwmon_dev);
|
hwmon_device_unregister(data->hwmon_dev);
|
||||||
sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group_opt);
|
sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group_opt);
|
||||||
sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group);
|
sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group);
|
||||||
kfree(i2c_get_clientdata(client));
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user