Commit a44cdd2c authored by Bryan Wu's avatar Bryan Wu

leds: convert Freescale MC13783 LED driver to devm_kzalloc() and cleanup error exit path

Cc: Philippe Retornaz <philippe.retornaz@epfl.ch>
Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
parent bcbf0162
...@@ -280,7 +280,8 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev) ...@@ -280,7 +280,8 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
led = kcalloc(pdata->num_leds, sizeof(*led), GFP_KERNEL); led = devm_kzalloc(&pdev->dev, pdata->num_leds * sizeof(*led),
GFP_KERNEL);
if (led == NULL) { if (led == NULL) {
dev_err(&pdev->dev, "failed to alloc memory\n"); dev_err(&pdev->dev, "failed to alloc memory\n");
return -ENOMEM; return -ENOMEM;
...@@ -289,7 +290,7 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev) ...@@ -289,7 +290,7 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev)
ret = mc13783_leds_prepare(pdev); ret = mc13783_leds_prepare(pdev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to init led driver\n"); dev_err(&pdev->dev, "unable to init led driver\n");
goto err_free; return ret;
} }
for (i = 0; i < pdata->num_leds; i++) { for (i = 0; i < pdata->num_leds; i++) {
...@@ -344,8 +345,6 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev) ...@@ -344,8 +345,6 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev)
cancel_work_sync(&led[i].work); cancel_work_sync(&led[i].work);
} }
err_free:
kfree(led);
return ret; return ret;
} }
...@@ -373,7 +372,6 @@ static int __devexit mc13783_led_remove(struct platform_device *pdev) ...@@ -373,7 +372,6 @@ static int __devexit mc13783_led_remove(struct platform_device *pdev)
mc13xxx_unlock(dev); mc13xxx_unlock(dev);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(led);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment