backlight: ili922x: use devm_lcd_device_register()
authorJingoo Han <jg1.han@samsung.com>
Tue, 12 Nov 2013 23:09:26 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 03:09:19 +0000 (12:09 +0900)
Use devm_lcd_device_register() to make cleanup paths simpler.

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>
drivers/video/backlight/ili922x.c

index d9f65c2d9b0133635e1a3495e4c192b4e4dac69e..73464e4b4c747e32a32a8b830e1b0c936827e8a5 100644 (file)
@@ -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;
 }