Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/video/backlight/platform_lcd.c

+4 −5
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	plcd = kzalloc(sizeof(struct platform_lcd), GFP_KERNEL);

	plcd = devm_kzalloc(&pdev->dev, sizeof(struct platform_lcd),

			    GFP_KERNEL);

	if (!plcd) {

		dev_err(dev, "no memory for state\n");

		return -ENOMEM;
@@ -98,7 +99,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev) 
	if (IS_ERR(plcd->lcd)) {

		dev_err(dev, "cannot register lcd device\n");

		err = PTR_ERR(plcd->lcd);

		goto err_mem;

		goto err;

	}



	platform_set_drvdata(pdev, plcd);
@@ -106,8 +107,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev) 


	return 0;



 err_mem:

	kfree(plcd);

 err:

	return err;

}
@@ -116,7 +116,6 @@ static int __devexit platform_lcd_remove(struct platform_device *pdev) 
	struct platform_lcd *plcd = platform_get_drvdata(pdev);



	lcd_device_unregister(plcd->lcd);

	kfree(plcd);



	return 0;

}