提交 9cc7dcc5 编写于 作者: G Guenter Roeck

hwmon: (adt7470) Convert to use devm_ functions

Convert to use devm_ functions to reduce code size and simplify the code.
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
上级 08808300
...@@ -1256,11 +1256,10 @@ static int adt7470_probe(struct i2c_client *client, ...@@ -1256,11 +1256,10 @@ static int adt7470_probe(struct i2c_client *client,
struct adt7470_data *data; struct adt7470_data *data;
int err; int err;
data = kzalloc(sizeof(struct adt7470_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct adt7470_data),
if (!data) { GFP_KERNEL);
err = -ENOMEM; if (!data)
goto exit; return -ENOMEM;
}
data->num_temp_sensors = -1; data->num_temp_sensors = -1;
data->auto_update_interval = AUTO_UPDATE_INTERVAL; data->auto_update_interval = AUTO_UPDATE_INTERVAL;
...@@ -1277,7 +1276,7 @@ static int adt7470_probe(struct i2c_client *client, ...@@ -1277,7 +1276,7 @@ static int adt7470_probe(struct i2c_client *client,
data->attrs.attrs = adt7470_attr; data->attrs.attrs = adt7470_attr;
err = sysfs_create_group(&client->dev.kobj, &data->attrs); err = sysfs_create_group(&client->dev.kobj, &data->attrs);
if (err) if (err)
goto exit_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)) {
...@@ -1299,9 +1298,6 @@ static int adt7470_probe(struct i2c_client *client, ...@@ -1299,9 +1298,6 @@ static int adt7470_probe(struct i2c_client *client,
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
exit_remove: exit_remove:
sysfs_remove_group(&client->dev.kobj, &data->attrs); sysfs_remove_group(&client->dev.kobj, &data->attrs);
exit_free:
kfree(data);
exit:
return err; return err;
} }
...@@ -1313,7 +1309,6 @@ static int adt7470_remove(struct i2c_client *client) ...@@ -1313,7 +1309,6 @@ static int adt7470_remove(struct i2c_client *client)
wait_for_completion(&data->auto_update_stop); wait_for_completion(&data->auto_update_stop);
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &data->attrs); sysfs_remove_group(&client->dev.kobj, &data->attrs);
kfree(data);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册