Commit 6ecffe16 authored by Guenter Roeck's avatar Guenter Roeck

hwmon: (emc6w201) 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 e20b4b38
...@@ -492,11 +492,10 @@ static int emc6w201_probe(struct i2c_client *client, ...@@ -492,11 +492,10 @@ static int emc6w201_probe(struct i2c_client *client,
struct emc6w201_data *data; struct emc6w201_data *data;
int err; int err;
data = kzalloc(sizeof(struct emc6w201_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct emc6w201_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);
...@@ -504,7 +503,7 @@ static int emc6w201_probe(struct i2c_client *client, ...@@ -504,7 +503,7 @@ static int emc6w201_probe(struct i2c_client *client,
/* Create sysfs attribute */ /* Create sysfs attribute */
err = sysfs_create_group(&client->dev.kobj, &emc6w201_group); err = sysfs_create_group(&client->dev.kobj, &emc6w201_group);
if (err) if (err)
goto exit_free; return err;
/* Expose as a hwmon device */ /* Expose as a hwmon device */
data->hwmon_dev = hwmon_device_register(&client->dev); data->hwmon_dev = hwmon_device_register(&client->dev);
...@@ -517,9 +516,6 @@ static int emc6w201_probe(struct i2c_client *client, ...@@ -517,9 +516,6 @@ static int emc6w201_probe(struct i2c_client *client,
exit_remove: exit_remove:
sysfs_remove_group(&client->dev.kobj, &emc6w201_group); sysfs_remove_group(&client->dev.kobj, &emc6w201_group);
exit_free:
kfree(data);
exit:
return err; return err;
} }
...@@ -529,7 +525,6 @@ static int emc6w201_remove(struct i2c_client *client) ...@@ -529,7 +525,6 @@ static int emc6w201_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &emc6w201_group); sysfs_remove_group(&client->dev.kobj, &emc6w201_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