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 | 57457e314eefc7bce93854918a234e4ac9a52922 (patch) | |
| tree | dc643f8e6d52ca72168835df3caf960f7cf1678d /drivers/hwmon/ads1015.c | |
| parent | 08940b8aba8ded377e546c12c5b932364c0a03cc (diff) | |
| download | linux-57457e314eefc7bce93854918a234e4ac9a52922.tar.gz linux-57457e314eefc7bce93854918a234e4ac9a52922.tar.bz2 linux-57457e314eefc7bce93854918a234e4ac9a52922.zip | |
hwmon: (ads1015) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code.
Cc: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/ads1015.c')
| -rw-r--r-- | drivers/hwmon/ads1015.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c index 1958f03efd7a..2798246ad814 100644 --- a/drivers/hwmon/ads1015.c +++ b/drivers/hwmon/ads1015.c @@ -156,7 +156,6 @@ static int ads1015_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); for (k = 0; k < ADS1015_CHANNELS; ++k) device_remove_file(&client->dev, &ads1015_in[k].dev_attr); - kfree(data); return 0; } @@ -254,11 +253,10 @@ static int ads1015_probe(struct i2c_client *client, int err; unsigned int k; - data = kzalloc(sizeof(struct ads1015_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct ads1015_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -284,8 +282,6 @@ static int ads1015_probe(struct i2c_client *client, exit_remove: for (k = 0; k < ADS1015_CHANNELS; ++k) device_remove_file(&client->dev, &ads1015_in[k].dev_attr); - kfree(data); -exit: return err; } |