diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 09:58:02 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-23 21:08:30 -0700 |
| commit | f9286434ea64803b673bb4ec0dd7084b13c2d90b (patch) | |
| tree | 65907ed3c0c712cc800db8a84e33f814ae871601 /drivers/hwmon/amc6821.c | |
| parent | 9cc7dcc5238308250eb3ca4314f6423bd6f54ef0 (diff) | |
| download | linux-f9286434ea64803b673bb4ec0dd7084b13c2d90b.tar.bz2 | |
hwmon: (amc6821) 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>
Diffstat (limited to 'drivers/hwmon/amc6821.c')
| -rw-r--r-- | drivers/hwmon/amc6821.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c index f600fa1f92e3..ae482e3afdac 100644 --- a/drivers/hwmon/amc6821.c +++ b/drivers/hwmon/amc6821.c @@ -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); @@ -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)) @@ -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; } @@ -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; } |