backlight: convert platform_lcd to dev_pm_ops
authorJingoo Han <jg1.han@samsung.com>
Fri, 23 Mar 2012 22:02:02 +0000 (15:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2012 23:58:33 +0000 (16:58 -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>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/backlight/platform_lcd.c

index f0bf491ed087a57d86fade373ad326fb6c68300d..b6672340d6c78b2cac69e7665beb38f59450d6df 100644 (file)
@@ -121,9 +121,9 @@ static int __devexit platform_lcd_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int platform_lcd_suspend(struct platform_device *pdev, pm_message_t st)
+static int platform_lcd_suspend(struct device *dev)
 {
-       struct platform_lcd *plcd = platform_get_drvdata(pdev);
+       struct platform_lcd *plcd = dev_get_drvdata(dev);
 
        plcd->suspended = 1;
        platform_lcd_set_power(plcd->lcd, plcd->power);
@@ -131,29 +131,30 @@ static int platform_lcd_suspend(struct platform_device *pdev, pm_message_t st)
        return 0;
 }
 
-static int platform_lcd_resume(struct platform_device *pdev)
+static int platform_lcd_resume(struct device *dev)
 {
-       struct platform_lcd *plcd = platform_get_drvdata(pdev);
+       struct platform_lcd *plcd = dev_get_drvdata(dev);
 
        plcd->suspended = 0;
        platform_lcd_set_power(plcd->lcd, plcd->power);
 
        return 0;
 }
-#else
-#define platform_lcd_suspend NULL
-#define platform_lcd_resume NULL
+
+static SIMPLE_DEV_PM_OPS(platform_lcd_pm_ops, platform_lcd_suspend,
+                       platform_lcd_resume);
 #endif
 
 static struct platform_driver platform_lcd_driver = {
        .driver         = {
                .name   = "platform-lcd",
                .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+               .pm     = &platform_lcd_pm_ops,
+#endif
        },
        .probe          = platform_lcd_probe,
        .remove         = __devexit_p(platform_lcd_remove),
-       .suspend        = platform_lcd_suspend,
-       .resume         = platform_lcd_resume,
 };
 
 module_platform_driver(platform_lcd_driver);