diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2012-02-22 08:56:49 -0800 |
|---|---|---|
| committer |   Guenter Roeck <guenter.roeck@ericsson.com> | 2012-03-18 18:27:46 -0700 |
| commit | 36839287204f1c419907d3873f1e45062000e8a2 (patch) | |
| tree | 791547e087f072914199dcc93862b1bb144348f6 /drivers/hwmon | |
| parent | hwmon: (pmbus) Simplify remove functions (diff) | |
| download | linux-dev-36839287204f1c419907d3873f1e45062000e8a2.tar.xz linux-dev-36839287204f1c419907d3873f1e45062000e8a2.zip | |
hwmon: (ltc4261) Convert to use devm_kzalloc
Marginally less code and eliminate the possibility of memory leaks.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/ltc4261.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/hwmon/ltc4261.c b/drivers/hwmon/ltc4261.c index ab1bfbf2a3f0..069b7d34d8f9 100644 --- a/drivers/hwmon/ltc4261.c +++ b/drivers/hwmon/ltc4261.c @@ -235,11 +235,9 @@ static int ltc4261_probe(struct i2c_client *client, return -ENODEV; } - data = kzalloc(sizeof(*data), GFP_KERNEL); - if (!data) { - ret = -ENOMEM; - goto out_kzalloc; - } + data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -250,7 +248,7 @@ static int ltc4261_probe(struct i2c_client *client, /* Register sysfs hooks */ ret = sysfs_create_group(&client->dev.kobj, <c4261_group); if (ret) - goto out_sysfs_create_group; + return ret; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -262,9 +260,6 @@ static int ltc4261_probe(struct i2c_client *client, out_hwmon_device_register: sysfs_remove_group(&client->dev.kobj, <c4261_group); -out_sysfs_create_group: - kfree(data); -out_kzalloc: return ret; } @@ -275,8 +270,6 @@ static int ltc4261_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, <c4261_group); - kfree(data); - return 0; } |