diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-07-04 11:21:36 +0800 |
|---|---|---|
| committer | Bryan Wu <bryan.wu@canonical.com> | 2012-07-24 07:52:36 +0800 |
| commit | 7f13bbf799f28d5c718a2f18c42f0c6ab56f501b (patch) | |
| tree | b34c59cc32eb3874ee5569994a3de29ec07a78cd /drivers/leds | |
| parent | d41589658ed1607303e702805c51030d6ecfc471 (diff) | |
| download | linux-7f13bbf799f28d5c718a2f18c42f0c6ab56f501b.tar.gz linux-7f13bbf799f28d5c718a2f18c42f0c6ab56f501b.tar.bz2 linux-7f13bbf799f28d5c718a2f18c42f0c6ab56f501b.zip | |
leds: Use devm_kzalloc in leds-max8997.c file
devm_kzalloc() makes code cleanup simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-max8997.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/leds/leds-max8997.c b/drivers/leds/leds-max8997.c index 86abfe24ad28..bf86d5483f43 100644 --- a/drivers/leds/leds-max8997.c +++ b/drivers/leds/leds-max8997.c @@ -276,11 +276,9 @@ static int __devinit max8997_led_probe(struct platform_device *pdev) return -ENODEV; } - led = kzalloc(sizeof(*led), GFP_KERNEL); - if (led == NULL) { - ret = -ENOMEM; - goto err_mem; - } + led = devm_kzalloc(&pdev->dev, sizeof(*led), GFP_KERNEL); + if (led == NULL) + return -ENOMEM; led->id = pdev->id; snprintf(name, sizeof(name), "max8997-led%d", pdev->id); @@ -315,23 +313,17 @@ static int __devinit max8997_led_probe(struct platform_device *pdev) ret = led_classdev_register(&pdev->dev, &led->cdev); if (ret < 0) - goto err_led; + return ret; ret = device_create_file(led->cdev.dev, &dev_attr_mode); if (ret != 0) { dev_err(&pdev->dev, "failed to create file: %d\n", ret); - goto err_file; + led_classdev_unregister(&led->cdev); + return ret; } return 0; - -err_file: - led_classdev_unregister(&led->cdev); -err_led: - kfree(led); -err_mem: - return ret; } static int __devexit max8997_led_remove(struct platform_device *pdev) @@ -340,7 +332,6 @@ static int __devexit max8997_led_remove(struct platform_device *pdev) device_remove_file(led->cdev.dev, &dev_attr_mode); led_classdev_unregister(&led->cdev); - kfree(led); return 0; } |