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