提交 d2b95e58 编写于 作者: G Guenter Roeck

hwmon: (ltc4215) Convert to use devm_ functions

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

Cc: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
上级 78968642
...@@ -253,11 +253,9 @@ static int ltc4215_probe(struct i2c_client *client, ...@@ -253,11 +253,9 @@ static int ltc4215_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);
...@@ -268,7 +266,7 @@ static int ltc4215_probe(struct i2c_client *client, ...@@ -268,7 +266,7 @@ static int ltc4215_probe(struct i2c_client *client,
/* Register sysfs hooks */ /* Register sysfs hooks */
ret = sysfs_create_group(&client->dev.kobj, &ltc4215_group); ret = sysfs_create_group(&client->dev.kobj, &ltc4215_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)) {
...@@ -280,9 +278,6 @@ static int ltc4215_probe(struct i2c_client *client, ...@@ -280,9 +278,6 @@ static int ltc4215_probe(struct i2c_client *client,
out_hwmon_device_register: out_hwmon_device_register:
sysfs_remove_group(&client->dev.kobj, &ltc4215_group); sysfs_remove_group(&client->dev.kobj, &ltc4215_group);
out_sysfs_create_group:
kfree(data);
out_kzalloc:
return ret; return ret;
} }
...@@ -293,8 +288,6 @@ static int ltc4215_remove(struct i2c_client *client) ...@@ -293,8 +288,6 @@ static int ltc4215_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &ltc4215_group); sysfs_remove_group(&client->dev.kobj, &ltc4215_group);
kfree(data);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册