Skip to content

Commit

Permalink
hwmon: (amc6821) Convert to use devm_ functions
Browse files Browse the repository at this point in the history
Convert to use devm_ functions to reduce code size and simplify the code.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  • Loading branch information
Guenter Roeck committed Sep 24, 2012
1 parent 9cc7dcc commit f928643
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions drivers/hwmon/amc6821.c
Original file line number Diff line number Diff line change
Expand Up @@ -862,12 +862,10 @@ static int amc6821_probe(
struct amc6821_data *data;
int err;

data = kzalloc(sizeof(struct amc6821_data), GFP_KERNEL);
if (!data) {
dev_err(&client->dev, "out of memory.\n");
data = devm_kzalloc(&client->dev, sizeof(struct amc6821_data),
GFP_KERNEL);
if (!data)
return -ENOMEM;
}


i2c_set_clientdata(client, data);
mutex_init(&data->update_lock);
Expand All @@ -877,11 +875,11 @@ static int amc6821_probe(
*/
err = amc6821_init_client(client);
if (err)
goto err_free;
return err;

err = sysfs_create_group(&client->dev.kobj, &amc6821_attr_grp);
if (err)
goto err_free;
return err;

data->hwmon_dev = hwmon_device_register(&client->dev);
if (!IS_ERR(data->hwmon_dev))
Expand All @@ -890,8 +888,6 @@ static int amc6821_probe(
err = PTR_ERR(data->hwmon_dev);
dev_err(&client->dev, "error registering hwmon device.\n");
sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp);
err_free:
kfree(data);
return err;
}

Expand All @@ -902,8 +898,6 @@ static int amc6821_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp);

kfree(data);

return 0;
}

Expand Down

0 comments on commit f928643

Please sign in to comment.