forked from luck/tmp_suning_uos_patched
hwmon: (ltc4151) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code. Cc: Per Dalen <per.dalen@appeartv.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
7008b9704a
commit
78968642cc
@ -181,11 +181,9 @@ static int ltc4151_probe(struct i2c_client *client,
|
|||||||
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
|
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
data = kzalloc(sizeof(*data), GFP_KERNEL);
|
data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
|
||||||
if (!data) {
|
if (!data)
|
||||||
ret = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto out_kzalloc;
|
|
||||||
}
|
|
||||||
|
|
||||||
i2c_set_clientdata(client, data);
|
i2c_set_clientdata(client, data);
|
||||||
mutex_init(&data->update_lock);
|
mutex_init(&data->update_lock);
|
||||||
@ -193,7 +191,7 @@ static int ltc4151_probe(struct i2c_client *client,
|
|||||||
/* Register sysfs hooks */
|
/* Register sysfs hooks */
|
||||||
ret = sysfs_create_group(&client->dev.kobj, <c4151_group);
|
ret = sysfs_create_group(&client->dev.kobj, <c4151_group);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out_sysfs_create_group;
|
return ret;
|
||||||
|
|
||||||
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)) {
|
||||||
@ -205,9 +203,6 @@ static int ltc4151_probe(struct i2c_client *client,
|
|||||||
|
|
||||||
out_hwmon_device_register:
|
out_hwmon_device_register:
|
||||||
sysfs_remove_group(&client->dev.kobj, <c4151_group);
|
sysfs_remove_group(&client->dev.kobj, <c4151_group);
|
||||||
out_sysfs_create_group:
|
|
||||||
kfree(data);
|
|
||||||
out_kzalloc:
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -218,8 +213,6 @@ static int ltc4151_remove(struct i2c_client *client)
|
|||||||
hwmon_device_unregister(data->hwmon_dev);
|
hwmon_device_unregister(data->hwmon_dev);
|
||||||
sysfs_remove_group(&client->dev.kobj, <c4151_group);
|
sysfs_remove_group(&client->dev.kobj, <c4151_group);
|
||||||
|
|
||||||
kfree(data);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user