p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Jingoo Han 2013-11-12 15:09:31 -08:00 committed by Linus Torvalds
parent e8796d9f4f
commit 1f9ca1eee8
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/video/backlight/platform_lcd.c
View File

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