backlight: tdo24m: convert tdo24m to dev_pm_ops
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:17:47 +0000 (16:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:17 +0000 (18:28 -0700)
Instead of using legacy suspend/resume methods, using newer dev_pm_ops
structure allows better control over power management.

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/tdo24m.c

index 00162085eec0ae397d5abfd3589edbab772a7d61..18cdf466d50a5710ea73e0ae5d7ce34a5d188d83 100644 (file)
@@ -412,25 +412,24 @@ static int tdo24m_remove(struct spi_device *spi)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int tdo24m_suspend(struct spi_device *spi, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int tdo24m_suspend(struct device *dev)
 {
-       struct tdo24m *lcd = spi_get_drvdata(spi);
+       struct tdo24m *lcd = dev_get_drvdata(dev);
 
        return tdo24m_power(lcd, FB_BLANK_POWERDOWN);
 }
 
-static int tdo24m_resume(struct spi_device *spi)
+static int tdo24m_resume(struct device *dev)
 {
-       struct tdo24m *lcd = spi_get_drvdata(spi);
+       struct tdo24m *lcd = dev_get_drvdata(dev);
 
        return tdo24m_power(lcd, FB_BLANK_UNBLANK);
 }
-#else
-#define tdo24m_suspend NULL
-#define tdo24m_resume  NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(tdo24m_pm_ops, tdo24m_suspend, tdo24m_resume);
+
 /* Power down all displays on reboot, poweroff or halt */
 static void tdo24m_shutdown(struct spi_device *spi)
 {
@@ -443,12 +442,11 @@ static struct spi_driver tdo24m_driver = {
        .driver = {
                .name           = "tdo24m",
                .owner          = THIS_MODULE,
+               .pm             = &tdo24m_pm_ops,
        },
        .probe          = tdo24m_probe,
        .remove         = tdo24m_remove,
        .shutdown       = tdo24m_shutdown,
-       .suspend        = tdo24m_suspend,
-       .resume         = tdo24m_resume,
 };
 
 module_spi_driver(tdo24m_driver);