diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 09:58:03 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-23 21:08:31 -0700 |
| commit | 3aa9d1df7e7abc91fb11bff41f389f3fc7b39eee (patch) | |
| tree | 8d0ae9a8fe06d1d876c671572a7bf040012474f3 | |
| parent | 805fd8c5b8868036e1e1298fcccf7499f6d6ede2 (diff) | |
| download | linux-3.10-3aa9d1df7e7abc91fb11bff41f389f3fc7b39eee.tar.gz linux-3.10-3aa9d1df7e7abc91fb11bff41f389f3fc7b39eee.tar.bz2 linux-3.10-3aa9d1df7e7abc91fb11bff41f389f3fc7b39eee.zip | |
hwmon: (ds620) 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/ds620.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/hwmon/ds620.c b/drivers/hwmon/ds620.c index 50663efad41..f1d6b422cf0 100644 --- a/drivers/hwmon/ds620.c +++ b/drivers/hwmon/ds620.c @@ -232,11 +232,10 @@ static int ds620_probe(struct i2c_client *client, struct ds620_data *data; int err; - data = kzalloc(sizeof(struct ds620_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct ds620_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -247,7 +246,7 @@ static int ds620_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &ds620_group); if (err) - goto exit_free; + return err; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -261,9 +260,6 @@ static int ds620_probe(struct i2c_client *client, exit_remove_files: sysfs_remove_group(&client->dev.kobj, &ds620_group); -exit_free: - kfree(data); -exit: return err; } @@ -274,8 +270,6 @@ static int ds620_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &ds620_group); - kfree(data); - return 0; } |