backlight: ili922x: use devm_lcd_device_register()

Use devm_lcd_device_register() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c
index d9f65c2d9b0133635e1a3495e4c192b4e4dac69e..73464e4b4c747e32a32a8b830e1b0c936827e8a5 100644 (file)
--- a/drivers/video/backlight/ili922x.c
+++ b/drivers/video/backlight/ili922x.c
@@ -513,8 +513,8 @@ static int ili922x_probe(struct spi_device *spi)
 
        ili->power = FB_BLANK_POWERDOWN;
 
-       lcd = lcd_device_register("ili922xlcd", &spi->dev, ili,
-                                 &ili922x_ops);
+       lcd = devm_lcd_device_register(&spi->dev, "ili922xlcd", &spi->dev, ili,
+                                       &ili922x_ops);
        if (IS_ERR(lcd)) {
                dev_err(&spi->dev, "cannot register LCD\n");
                return PTR_ERR(lcd);
@@ -530,10 +530,7 @@ static int ili922x_probe(struct spi_device *spi)
 
 static int ili922x_remove(struct spi_device *spi)
 {
-       struct ili922x *ili = spi_get_drvdata(spi);
-
        ili922x_poweroff(spi);
-       lcd_device_unregister(ili->ld);
        return 0;
 }