Commit 48e78e8c authored by Mark Brown's avatar Mark Brown Committed by Linus Torvalds

backlight: convert platform_lcd to devm_kzalloc()

Saves some error handling code and eliminates a class of leaks.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 66655760
...@@ -85,7 +85,8 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev) ...@@ -85,7 +85,8 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
plcd = kzalloc(sizeof(struct platform_lcd), GFP_KERNEL); plcd = devm_kzalloc(&pdev->dev, sizeof(struct platform_lcd),
GFP_KERNEL);
if (!plcd) { if (!plcd) {
dev_err(dev, "no memory for state\n"); dev_err(dev, "no memory for state\n");
return -ENOMEM; return -ENOMEM;
...@@ -98,7 +99,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev) ...@@ -98,7 +99,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev)
if (IS_ERR(plcd->lcd)) { if (IS_ERR(plcd->lcd)) {
dev_err(dev, "cannot register lcd device\n"); dev_err(dev, "cannot register lcd device\n");
err = PTR_ERR(plcd->lcd); err = PTR_ERR(plcd->lcd);
goto err_mem; goto err;
} }
platform_set_drvdata(pdev, plcd); platform_set_drvdata(pdev, plcd);
...@@ -106,8 +107,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev) ...@@ -106,8 +107,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev)
return 0; return 0;
err_mem: err:
kfree(plcd);
return err; return err;
} }
...@@ -116,7 +116,6 @@ static int __devexit platform_lcd_remove(struct platform_device *pdev) ...@@ -116,7 +116,6 @@ static int __devexit platform_lcd_remove(struct platform_device *pdev)
struct platform_lcd *plcd = platform_get_drvdata(pdev); struct platform_lcd *plcd = platform_get_drvdata(pdev);
lcd_device_unregister(plcd->lcd); lcd_device_unregister(plcd->lcd);
kfree(plcd);
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