Commit 96f316c2 authored by Guenter Roeck's avatar Guenter Roeck

hwmon: (max6642) 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: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
parent 215690a4
...@@ -286,11 +286,10 @@ static int max6642_probe(struct i2c_client *new_client, ...@@ -286,11 +286,10 @@ static int max6642_probe(struct i2c_client *new_client,
struct max6642_data *data; struct max6642_data *data;
int err; int err;
data = kzalloc(sizeof(struct max6642_data), GFP_KERNEL); data = devm_kzalloc(&new_client->dev, sizeof(struct max6642_data),
if (!data) { GFP_KERNEL);
err = -ENOMEM; if (!data)
goto exit; return -ENOMEM;
}
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
...@@ -301,7 +300,7 @@ static int max6642_probe(struct i2c_client *new_client, ...@@ -301,7 +300,7 @@ static int max6642_probe(struct i2c_client *new_client,
/* Register sysfs hooks */ /* Register sysfs hooks */
err = sysfs_create_group(&new_client->dev.kobj, &max6642_group); err = sysfs_create_group(&new_client->dev.kobj, &max6642_group);
if (err) if (err)
goto exit_free; return err;
data->hwmon_dev = hwmon_device_register(&new_client->dev); data->hwmon_dev = hwmon_device_register(&new_client->dev);
if (IS_ERR(data->hwmon_dev)) { if (IS_ERR(data->hwmon_dev)) {
...@@ -313,9 +312,6 @@ static int max6642_probe(struct i2c_client *new_client, ...@@ -313,9 +312,6 @@ static int max6642_probe(struct i2c_client *new_client,
exit_remove_files: exit_remove_files:
sysfs_remove_group(&new_client->dev.kobj, &max6642_group); sysfs_remove_group(&new_client->dev.kobj, &max6642_group);
exit_free:
kfree(data);
exit:
return err; return err;
} }
...@@ -326,7 +322,6 @@ static int max6642_remove(struct i2c_client *client) ...@@ -326,7 +322,6 @@ static int max6642_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &max6642_group); sysfs_remove_group(&client->dev.kobj, &max6642_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