diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 09:58:00 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-23 21:08:30 -0700 |
| commit | 34e3f7f5a283c5520e0e1a409931a632f4d2662e (patch) | |
| tree | 3c2d7edb06e0d6a97229c89d3a4ca318f734ef7f | |
| parent | 57457e314eefc7bce93854918a234e4ac9a52922 (diff) | |
| download | op-kernel-dev-34e3f7f5a283c5520e0e1a409931a632f4d2662e.zip op-kernel-dev-34e3f7f5a283c5520e0e1a409931a632f4d2662e.tar.gz | |
hwmon: (ads7828) 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>
| -rw-r--r-- | drivers/hwmon/ads7828.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c index bf3fdf4..1f9e8af 100644 --- a/drivers/hwmon/ads7828.c +++ b/drivers/hwmon/ads7828.c @@ -154,7 +154,6 @@ static int ads7828_remove(struct i2c_client *client) struct ads7828_data *data = i2c_get_clientdata(client); hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &ads7828_group); - kfree(i2c_get_clientdata(client)); return 0; } @@ -217,11 +216,10 @@ static int ads7828_probe(struct i2c_client *client, struct ads7828_data *data; int err; - data = kzalloc(sizeof(struct ads7828_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct ads7828_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -229,7 +227,7 @@ static int ads7828_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &ads7828_group); if (err) - goto exit_free; + return err; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -241,9 +239,6 @@ static int ads7828_probe(struct i2c_client *client, exit_remove: sysfs_remove_group(&client->dev.kobj, &ads7828_group); -exit_free: - kfree(data); -exit: return err; } |
