diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 09:58:09 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-07-21 21:48:40 -0700 |
| commit | c38b2820cb4014b86b0bf45f334d3436c03b14be (patch) | |
| tree | 9a13c3b0980acefda196f562216a50315dca394c /drivers/hwmon | |
| parent | 52714c04df4b12ca308a1d792d50681df43365c2 (diff) | |
| download | blackbird-op-linux-c38b2820cb4014b86b0bf45f334d3436c03b14be.tar.gz blackbird-op-linux-c38b2820cb4014b86b0bf45f334d3436c03b14be.zip | |
hwmon: (lm80) 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>
Acked-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/lm80.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c index e2c43e1774be..28a8b71f4571 100644 --- a/drivers/hwmon/lm80.c +++ b/drivers/hwmon/lm80.c @@ -543,11 +543,9 @@ static int lm80_probe(struct i2c_client *client, struct lm80_data *data; int err; - data = kzalloc(sizeof(struct lm80_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct lm80_data), GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -562,7 +560,7 @@ static int lm80_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &lm80_group); if (err) - goto error_free; + return err; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -574,9 +572,6 @@ static int lm80_probe(struct i2c_client *client, error_remove: sysfs_remove_group(&client->dev.kobj, &lm80_group); -error_free: - kfree(data); -exit: return err; } @@ -587,7 +582,6 @@ static int lm80_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &lm80_group); - kfree(data); return 0; } |
