leds: convert DA9030/DA9034 LED driver to devm_kzalloc() and cleanup error exit path
authorBryan Wu <bryan.wu@canonical.com>
Tue, 3 Jul 2012 05:07:53 +0000 (13:07 +0800)
committerBryan Wu <bryan.wu@canonical.com>
Mon, 23 Jul 2012 23:52:37 +0000 (07:52 +0800)
Cc: Eric Miao <eric.miao@canonical.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
drivers/leds/leds-da903x.c

index d9cd73ebd6c44c3e89ff032e2c2155eb036ad972..cc77c9d926159724a8e580e109ef488e138b7cdb 100644 (file)
@@ -108,7 +108,7 @@ static int __devinit da903x_led_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       led = kzalloc(sizeof(struct da903x_led), GFP_KERNEL);
+       led = devm_kzalloc(&pdev->dev, sizeof(struct da903x_led), GFP_KERNEL);
        if (led == NULL) {
                dev_err(&pdev->dev, "failed to alloc memory for LED%d\n", id);
                return -ENOMEM;
@@ -129,15 +129,11 @@ static int __devinit da903x_led_probe(struct platform_device *pdev)
        ret = led_classdev_register(led->master, &led->cdev);
        if (ret) {
                dev_err(&pdev->dev, "failed to register LED %d\n", id);
-               goto err;
+               return ret;
        }
 
        platform_set_drvdata(pdev, led);
        return 0;
-
-err:
-       kfree(led);
-       return ret;
 }
 
 static int __devexit da903x_led_remove(struct platform_device *pdev)
@@ -145,7 +141,6 @@ static int __devexit da903x_led_remove(struct platform_device *pdev)
        struct da903x_led *led = platform_get_drvdata(pdev);
 
        led_classdev_unregister(&led->cdev);
-       kfree(led);
        return 0;
 }