diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 09:58:12 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-07-21 21:48:41 -0700 |
| commit | 215690a4f1050cdf3267e72e2d8c9c62d47b7b1f (patch) | |
| tree | cfe1173b7d0883d87fa2543740dfb8b27dd8c1fe /drivers/hwmon/max1619.c | |
| parent | 661f020f56c698be9cf40f0b3c8963c2d15be0dd (diff) | |
| download | linux-stable-215690a4f1050cdf3267e72e2d8c9c62d47b7b1f.tar.gz linux-stable-215690a4f1050cdf3267e72e2d8c9c62d47b7b1f.tar.bz2 linux-stable-215690a4f1050cdf3267e72e2d8c9c62d47b7b1f.zip | |
hwmon: (max1619) 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/max1619.c')
| -rw-r--r-- | drivers/hwmon/max1619.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index ecac04a7b7d6..6c11ec214071 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c @@ -267,11 +267,10 @@ static int max1619_probe(struct i2c_client *new_client, struct max1619_data *data; int err; - data = kzalloc(sizeof(struct max1619_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&new_client->dev, sizeof(struct max1619_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(new_client, data); data->valid = 0; @@ -283,7 +282,7 @@ static int max1619_probe(struct i2c_client *new_client, /* Register sysfs hooks */ err = sysfs_create_group(&new_client->dev.kobj, &max1619_group); if (err) - goto exit_free; + return err; data->hwmon_dev = hwmon_device_register(&new_client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -295,9 +294,6 @@ static int max1619_probe(struct i2c_client *new_client, exit_remove_files: sysfs_remove_group(&new_client->dev.kobj, &max1619_group); -exit_free: - kfree(data); -exit: return err; } @@ -323,7 +319,6 @@ static int max1619_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &max1619_group); - kfree(data); return 0; } |