diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 20:58:03 +0400 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-07-22 08:48:39 +0400 |
| commit | e20b4b38cdf1622d1577ae5e402ded2bd63bf616 (patch) | |
| tree | 818cad2ef7a91392b2e94705049e0bd754afb4c0 | |
| parent | d466a353052582ea784d9f5352c822d828d00244 (diff) | |
| download | linux-e20b4b38cdf1622d1577ae5e402ded2bd63bf616.tar.xz | |
hwmon: (ds1621) 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>
| -rw-r--r-- | drivers/hwmon/ds1621.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c index f647a3307ebc..1c568736baff 100644 --- a/drivers/hwmon/ds1621.c +++ b/drivers/hwmon/ds1621.c @@ -249,11 +249,10 @@ static int ds1621_probe(struct i2c_client *client, struct ds1621_data *data; int err; - data = kzalloc(sizeof(struct ds1621_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct ds1621_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -264,7 +263,7 @@ static int ds1621_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &ds1621_group); if (err) - goto exit_free; + return err; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -276,9 +275,6 @@ static int ds1621_probe(struct i2c_client *client, exit_remove_files: sysfs_remove_group(&client->dev.kobj, &ds1621_group); - exit_free: - kfree(data); - exit: return err; } @@ -289,8 +285,6 @@ static int ds1621_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &ds1621_group); - kfree(data); - return 0; } |