backlight: vgg2432a4: convert vgg2432a4_driver to dev_pm_ops

Instead of using legacy suspend/resume methods, using newer dev_pm_ops
structure allows better control over power management. Also, use of
pm_message_t is deprecated. Thus, it is removed.

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>

diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index c3a529966dd0f90808f81db841189f23dba8675e..f8be90c5dedcbd772f8d0ad3a6c685da8eb6b9b4 100644 (file)
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -270,27 +270,21 @@ int ili9320_remove(struct ili9320 *ili)
 }
 EXPORT_SYMBOL_GPL(ili9320_remove);
 
-#ifdef CONFIG_PM
-int ili9320_suspend(struct ili9320 *lcd, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+int ili9320_suspend(struct ili9320 *lcd)
 {
        int ret;
 
-       dev_dbg(lcd->dev, "%s: event %d\n", __func__, state.event);
+       ret = ili9320_power(lcd, FB_BLANK_POWERDOWN);
 
-       if (state.event == PM_EVENT_SUSPEND) {
-               ret = ili9320_power(lcd, FB_BLANK_POWERDOWN);
-
-               if (lcd->platdata->suspend == ILI9320_SUSPEND_DEEP) {
-                       ili9320_write(lcd, ILI9320_POWER1, lcd->power1 |
-                                     ILI9320_POWER1_SLP |
-                                     ILI9320_POWER1_DSTB);
-                       lcd->initialised = 0;
-               }
-
-               return ret;
+       if (lcd->platdata->suspend == ILI9320_SUSPEND_DEEP) {
+               ili9320_write(lcd, ILI9320_POWER1, lcd->power1 |
+                             ILI9320_POWER1_SLP |
+                             ILI9320_POWER1_DSTB);
+               lcd->initialised = 0;
        }
 
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL_GPL(ili9320_suspend);
 

diff --git a/drivers/video/backlight/ili9320.h b/drivers/video/backlight/ili9320.h
index e0db738f7bb9fddd7dd4dc11787ac4f7a8307170..42329e7aa9a851e9e5f2dfb60f9909d519112b5f 100644 (file)
--- a/drivers/video/backlight/ili9320.h
+++ b/drivers/video/backlight/ili9320.h
@@ -76,5 +76,5 @@ extern void ili9320_shutdown(struct ili9320 *lcd);
 
 /* PM */
 
-extern int ili9320_suspend(struct ili9320 *lcd, pm_message_t state);
+extern int ili9320_suspend(struct ili9320 *lcd);
 extern int ili9320_resume(struct ili9320 *lcd);

diff --git a/drivers/video/backlight/vgg2432a4.c b/drivers/video/backlight/vgg2432a4.c
index 84d582f591dc30b71b10ccf39d96350a0658a0b7..d538947a67d3e58708cdad2ee264922378eeab75 100644 (file)
--- a/drivers/video/backlight/vgg2432a4.c
+++ b/drivers/video/backlight/vgg2432a4.c
@@ -205,18 +205,15 @@ static int vgg2432a4_lcd_init(struct ili9320 *lcd,
        return ret;
 }
 
-#ifdef CONFIG_PM
-static int vgg2432a4_suspend(struct spi_device *spi, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int vgg2432a4_suspend(struct device *dev)
 {
-       return ili9320_suspend(spi_get_drvdata(spi), state);
+       return ili9320_suspend(dev_get_drvdata(dev));
 }
-static int vgg2432a4_resume(struct spi_device *spi)
+static int vgg2432a4_resume(struct device *dev)
 {
-       return ili9320_resume(spi_get_drvdata(spi));
+       return ili9320_resume(dev_get_drvdata(dev));
 }
-#else
-#define vgg2432a4_suspend      NULL
-#define vgg2432a4_resume       NULL
 #endif
 
 static struct ili9320_client vgg2432a4_client = {
@@ -249,16 +246,17 @@ static void vgg2432a4_shutdown(struct spi_device *spi)
        ili9320_shutdown(spi_get_drvdata(spi));
 }
 
+static SIMPLE_DEV_PM_OPS(vgg2432a4_pm_ops, vgg2432a4_suspend, vgg2432a4_resume);
+
 static struct spi_driver vgg2432a4_driver = {
        .driver = {
                .name           = "VGG2432A4",
                .owner          = THIS_MODULE,
+               .pm             = &vgg2432a4_pm_ops,
        },
        .probe          = vgg2432a4_probe,
        .remove         = vgg2432a4_remove,
        .shutdown       = vgg2432a4_shutdown,
-       .suspend        = vgg2432a4_suspend,
-       .resume         = vgg2432a4_resume,
 };
 
 module_spi_driver(vgg2432a4_driver);