diff options
author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 12:58:11 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-24 00:08:31 -0400 |
commit | 1487bf70c1b123469893b5dc6d910ef21f59d2f7 (patch) | |
tree | ed04b90390cd6168fbd3edeff94adfc08e1e8cc5 /drivers/hwmon/lm95241.c | |
parent | 33ed6d4a82b7422a0ab2f97f19fc841670da99d4 (diff) |
hwmon: (lm95241) 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>
Diffstat (limited to 'drivers/hwmon/lm95241.c')
-rw-r--r-- | drivers/hwmon/lm95241.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c index bd8cdb7b96ed..4b68fb2a31d7 100644 --- a/drivers/hwmon/lm95241.c +++ b/drivers/hwmon/lm95241.c | |||
@@ -391,11 +391,10 @@ static int lm95241_probe(struct i2c_client *new_client, | |||
391 | struct lm95241_data *data; | 391 | struct lm95241_data *data; |
392 | int err; | 392 | int err; |
393 | 393 | ||
394 | data = kzalloc(sizeof(struct lm95241_data), GFP_KERNEL); | 394 | data = devm_kzalloc(&new_client->dev, sizeof(struct lm95241_data), |
395 | if (!data) { | 395 | GFP_KERNEL); |
396 | err = -ENOMEM; | 396 | if (!data) |
397 | goto exit; | 397 | return -ENOMEM; |
398 | } | ||
399 | 398 | ||
400 | i2c_set_clientdata(new_client, data); | 399 | i2c_set_clientdata(new_client, data); |
401 | mutex_init(&data->update_lock); | 400 | mutex_init(&data->update_lock); |
@@ -406,7 +405,7 @@ static int lm95241_probe(struct i2c_client *new_client, | |||
406 | /* Register sysfs hooks */ | 405 | /* Register sysfs hooks */ |
407 | err = sysfs_create_group(&new_client->dev.kobj, &lm95241_group); | 406 | err = sysfs_create_group(&new_client->dev.kobj, &lm95241_group); |
408 | if (err) | 407 | if (err) |
409 | goto exit_free; | 408 | return err; |
410 | 409 | ||
411 | data->hwmon_dev = hwmon_device_register(&new_client->dev); | 410 | data->hwmon_dev = hwmon_device_register(&new_client->dev); |
412 | if (IS_ERR(data->hwmon_dev)) { | 411 | if (IS_ERR(data->hwmon_dev)) { |
@@ -418,9 +417,6 @@ static int lm95241_probe(struct i2c_client *new_client, | |||
418 | 417 | ||
419 | exit_remove_files: | 418 | exit_remove_files: |
420 | sysfs_remove_group(&new_client->dev.kobj, &lm95241_group); | 419 | sysfs_remove_group(&new_client->dev.kobj, &lm95241_group); |
421 | exit_free: | ||
422 | kfree(data); | ||
423 | exit: | ||
424 | return err; | 420 | return err; |
425 | } | 421 | } |
426 | 422 | ||
@@ -431,7 +427,6 @@ static int lm95241_remove(struct i2c_client *client) | |||
431 | hwmon_device_unregister(data->hwmon_dev); | 427 | hwmon_device_unregister(data->hwmon_dev); |
432 | sysfs_remove_group(&client->dev.kobj, &lm95241_group); | 428 | sysfs_remove_group(&client->dev.kobj, &lm95241_group); |
433 | 429 | ||
434 | kfree(data); | ||
435 | return 0; | 430 | return 0; |
436 | } | 431 | } |
437 | 432 | ||