diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-11-12 15:09:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 12:09:19 +0900 |
| commit | 1f9ca1eee8e93cacf1bff11dc3fdd01b7fd80cd7 (patch) | |
| tree | 053e15390169af8071480212c34fbd77bb2338f2 | |
| parent | e8796d9f4fde228478ccf953c3f97a58f8e34e48 (diff) | |
| download | linux-1f9ca1eee8e93cacf1bff11dc3fdd01b7fd80cd7.tar.gz linux-1f9ca1eee8e93cacf1bff11dc3fdd01b7fd80cd7.tar.bz2 linux-1f9ca1eee8e93cacf1bff11dc3fdd01b7fd80cd7.zip | |
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: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/video/backlight/platform_lcd.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c index cc0f0675366e..d01884d4f1bf 100644 --- a/drivers/video/backlight/platform_lcd.c +++ b/drivers/video/backlight/platform_lcd.c @@ -101,30 +101,17 @@ static int platform_lcd_probe(struct platform_device *pdev) plcd->us = dev; plcd->pdata = pdata; - plcd->lcd = lcd_device_register(dev_name(dev), dev, - plcd, &platform_lcd_ops); + plcd->lcd = devm_lcd_device_register(&pdev->dev, dev_name(dev), dev, + plcd, &platform_lcd_ops); if (IS_ERR(plcd->lcd)) { dev_err(dev, "cannot register lcd device\n"); - err = PTR_ERR(plcd->lcd); - goto err; + return PTR_ERR(plcd->lcd); } platform_set_drvdata(pdev, plcd); 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; } #ifdef CONFIG_PM_SLEEP @@ -168,7 +155,6 @@ static struct platform_driver platform_lcd_driver = { .of_match_table = of_match_ptr(platform_lcd_of_match), }, .probe = platform_lcd_probe, - .remove = platform_lcd_remove, }; module_platform_driver(platform_lcd_driver); |