1 files changed, 7 insertions, 16 deletions

diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index 1e0a3093ce50..506a6c236039 100644
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -702,7 +702,7 @@ static int ld9040_probe(struct spi_device *spi)
         lcd->spi = spi;
         lcd->dev = &spi->dev;
 
-        lcd->lcd_pd = spi->dev.platform_data;
+        lcd->lcd_pd = dev_get_platdata(&spi->dev);
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL.\n");
                 return -EINVAL;
@@ -716,7 +716,8 @@ static int ld9040_probe(struct spi_device *spi)
                 return ret;
         }
 
-        ld = lcd_device_register("ld9040", &spi->dev, lcd, &ld9040_lcd_ops);
+        ld = devm_lcd_device_register(&spi->dev, "ld9040", &spi->dev, lcd,
+                                        &ld9040_lcd_ops);
         if (IS_ERR(ld))
                 return PTR_ERR(ld);
 
@@ -726,12 +727,10 @@ static int ld9040_probe(struct spi_device *spi)
         props.type = BACKLIGHT_RAW;
         props.max_brightness = MAX_BRIGHTNESS;
 
-        bd = backlight_device_register("ld9040-bl", &spi->dev,
-                lcd, &ld9040_backlight_ops, &props);
-        if (IS_ERR(bd)) {
-                ret = PTR_ERR(bd);
-                goto out_unregister_lcd;
-        }
+        bd = devm_backlight_device_register(&spi->dev, "ld9040-bl", &spi->dev,
+                                        lcd, &ld9040_backlight_ops, &props);
+        if (IS_ERR(bd))
+                return PTR_ERR(bd);
 
         bd->props.brightness = MAX_BRIGHTNESS;
         lcd->bd = bd;
@@ -757,11 +756,6 @@ static int ld9040_probe(struct spi_device *spi)
 
         dev_info(&spi->dev, "ld9040 panel driver has been probed.\n");
         return 0;
-
-out_unregister_lcd:
-        lcd_device_unregister(lcd->ld);
-
-        return ret;
 }
 
 static int ld9040_remove(struct spi_device *spi)
@@ -769,9 +763,6 @@ static int ld9040_remove(struct spi_device *spi)
         struct ld9040 *lcd = spi_get_drvdata(spi);
 
         ld9040_power(lcd, FB_BLANK_POWERDOWN);
-        backlight_device_unregister(lcd->bd);
-        lcd_device_unregister(lcd->ld);
-
         return 0;
 }