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

Commit 1f9ca1ee authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

backlight: platform_lcd: use devm_lcd_device_register() 



Use devm_lcd_device_register() to make cleanup paths simpler, and remove
unnecessary remove().

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e8796d9f

drivers/video/backlight/platform_lcd.c

+3 −17
Original line number Original line Diff line number Diff line
@@ -101,29 +101,16 @@ static int platform_lcd_probe(struct platform_device *pdev) 




	plcd->us = dev;

	plcd->us = dev;

	plcd->pdata = pdata;

	plcd->pdata = pdata;

	plcd->lcd = lcd_device_register(dev_name(dev), dev,

	plcd->lcd = devm_lcd_device_register(&pdev->dev, dev_name(dev), dev,

						plcd, &platform_lcd_ops);

						plcd, &platform_lcd_ops);

	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);

		return PTR_ERR(plcd->lcd);

		goto err;

	}

	}





	platform_set_drvdata(pdev, plcd);

	platform_set_drvdata(pdev, plcd);

	platform_lcd_set_power(plcd->lcd, FB_BLANK_NORMAL);

	platform_lcd_set_power(plcd->lcd, FB_BLANK_NORMAL);





	return 0;



 err:

	return err;

}



static int platform_lcd_remove(struct platform_device *pdev)

{

	struct platform_lcd *plcd = platform_get_drvdata(pdev);



	lcd_device_unregister(plcd->lcd);



	return 0;

	return 0;

}

}
@@ -168,7 +155,6 @@ static struct platform_driver platform_lcd_driver = { 
		.of_match_table = of_match_ptr(platform_lcd_of_match),

		.of_match_table = of_match_ptr(platform_lcd_of_match),

	},

	},

	.probe		= platform_lcd_probe,

	.probe		= platform_lcd_probe,

	.remove		= platform_lcd_remove,

};

};





module_platform_driver(platform_lcd_driver);

module_platform_driver(platform_lcd_driver);