Commit e20b4b38 authored by Guenter Roeck's avatar Guenter Roeck

hwmon: (ds1621) Convert to use devm_ functions

Convert to use devm_ functions to reduce code size and simplify the code.
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
parent d466a353
...@@ -249,11 +249,10 @@ static int ds1621_probe(struct i2c_client *client, ...@@ -249,11 +249,10 @@ static int ds1621_probe(struct i2c_client *client,
struct ds1621_data *data; struct ds1621_data *data;
int err; int err;
data = kzalloc(sizeof(struct ds1621_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct ds1621_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);
...@@ -264,7 +263,7 @@ static int ds1621_probe(struct i2c_client *client, ...@@ -264,7 +263,7 @@ static int ds1621_probe(struct i2c_client *client,
/* Register sysfs hooks */ /* Register sysfs hooks */
err = sysfs_create_group(&client->dev.kobj, &ds1621_group); err = sysfs_create_group(&client->dev.kobj, &ds1621_group);
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)) {
...@@ -276,9 +275,6 @@ static int ds1621_probe(struct i2c_client *client, ...@@ -276,9 +275,6 @@ static int ds1621_probe(struct i2c_client *client,
exit_remove_files: exit_remove_files:
sysfs_remove_group(&client->dev.kobj, &ds1621_group); sysfs_remove_group(&client->dev.kobj, &ds1621_group);
exit_free:
kfree(data);
exit:
return err; return err;
} }
...@@ -289,8 +285,6 @@ static int ds1621_remove(struct i2c_client *client) ...@@ -289,8 +285,6 @@ static int ds1621_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &ds1621_group); sysfs_remove_group(&client->dev.kobj, &ds1621_group);
kfree(data);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment