dect
/
linux-2.6
Archived
13
0
Fork 0

hwmon: (ds620) 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>
This commit is contained in:
Guenter Roeck 2012-06-02 09:58:03 -07:00
parent 805fd8c5b8
commit 3aa9d1df7e
1 changed files with 5 additions and 11 deletions

View File

@ -232,11 +232,10 @@ static int ds620_probe(struct i2c_client *client,
struct ds620_data *data; struct ds620_data *data;
int err; int err;
data = kzalloc(sizeof(struct ds620_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct ds620_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);
@ -247,7 +246,7 @@ static int ds620_probe(struct i2c_client *client,
/* Register sysfs hooks */ /* Register sysfs hooks */
err = sysfs_create_group(&client->dev.kobj, &ds620_group); err = sysfs_create_group(&client->dev.kobj, &ds620_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)) {
@ -261,9 +260,6 @@ static int ds620_probe(struct i2c_client *client,
exit_remove_files: exit_remove_files:
sysfs_remove_group(&client->dev.kobj, &ds620_group); sysfs_remove_group(&client->dev.kobj, &ds620_group);
exit_free:
kfree(data);
exit:
return err; return err;
} }
@ -274,8 +270,6 @@ static int ds620_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &ds620_group); sysfs_remove_group(&client->dev.kobj, &ds620_group);
kfree(data);
return 0; return 0;
} }