diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 20:20:23 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-07-22 06:48:42 +0200 |
| commit | bd91d3bab8787f53c1b937ac817b0c59f8146b97 (patch) | |
| tree | c96cc2c7f6bf8d37fcd2884f89f9840b5535e1b3 /drivers/hwmon/thmc50.c | |
| parent | hwmon: (sis5595) Convert to use devm_ functions (diff) | |
| download | linux-bd91d3bab8787f53c1b937ac817b0c59f8146b97.tar.xz linux-bd91d3bab8787f53c1b937ac817b0c59f8146b97.zip | |
hwmon: (thmc50) 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/thmc50.c')
| -rw-r--r-- | drivers/hwmon/thmc50.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c index add9f019b24f..080c26370480 100644 --- a/drivers/hwmon/thmc50.c +++ b/drivers/hwmon/thmc50.c @@ -361,12 +361,10 @@ static int thmc50_probe(struct i2c_client *client, struct thmc50_data *data; int err; - data = kzalloc(sizeof(struct thmc50_data), GFP_KERNEL); - if (!data) { - pr_debug("thmc50: detect failed, kzalloc failed!\n"); - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct thmc50_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); data->type = id->driver_data; @@ -377,7 +375,7 @@ static int thmc50_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &thmc50_group); if (err) - goto exit_free; + return err; /* Register ADM1022 sysfs hooks */ if (data->has_temp3) { @@ -400,9 +398,6 @@ exit_remove_sysfs: sysfs_remove_group(&client->dev.kobj, &temp3_group); exit_remove_sysfs_thmc50: sysfs_remove_group(&client->dev.kobj, &thmc50_group); -exit_free: - kfree(data); -exit: return err; } @@ -415,8 +410,6 @@ static int thmc50_remove(struct i2c_client *client) if (data->has_temp3) sysfs_remove_group(&client->dev.kobj, &temp3_group); - kfree(data); - return 0; } |