backlight: adp5520: convert adp5520_bl to dev_pm_ops
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:17:38 +0000 (16:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:16 +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/adp5520_bl.c

index a1e41d4faa7137eff25b052c966fb2dde8b1d185..962d120f6d0d3970dd14ee6a0893a4ac27705589 100644 (file)
@@ -349,35 +349,34 @@ static int adp5520_bl_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int adp5520_bl_suspend(struct platform_device *pdev,
-                                pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int adp5520_bl_suspend(struct device *dev)
 {
-       struct backlight_device *bl = platform_get_drvdata(pdev);
+       struct backlight_device *bl = dev_get_drvdata(dev);
+
        return adp5520_bl_set(bl, 0);
 }
 
-static int adp5520_bl_resume(struct platform_device *pdev)
+static int adp5520_bl_resume(struct device *dev)
 {
-       struct backlight_device *bl = platform_get_drvdata(pdev);
+       struct backlight_device *bl = dev_get_drvdata(dev);
 
        backlight_update_status(bl);
        return 0;
 }
-#else
-#define adp5520_bl_suspend     NULL
-#define adp5520_bl_resume      NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(adp5520_bl_pm_ops, adp5520_bl_suspend,
+                       adp5520_bl_resume);
+
 static struct platform_driver adp5520_bl_driver = {
        .driver         = {
                .name   = "adp5520-backlight",
                .owner  = THIS_MODULE,
+               .pm     = &adp5520_bl_pm_ops,
        },
        .probe          = adp5520_bl_probe,
        .remove         = adp5520_bl_remove,
-       .suspend        = adp5520_bl_suspend,
-       .resume         = adp5520_bl_resume,
 };
 
 module_platform_driver(adp5520_bl_driver);