backlight: convert from legacy pm ops to dev_pm_ops

Convert drivers/video/backlight/class to use dev_pm_ops for power
management and remove Legacy PM ops hooks.

With this change, backlight class registers suspend/resume callbacks via
class->pm (dev_pm_ops) instead of Legacy class->suspend/resume.  When
__device_suspend() runs call-backs, it will find class->pm ops for the
backlight class.

[[email protected]: add CONFIG_PM_SLEEP to suspend/resume functions]
Signed-off-by: Shuah Khan <[email protected]>
Signed-off-by: Jingoo Han <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: Jingoo Han <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 53c52fbc93955d2b58dc9dfa6538d54216e3f3a3..3fccb6d3c8c343ee1735811a0fc184270e869bbc 100644 (file)
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -208,7 +208,8 @@ static ssize_t backlight_show_actual_brightness(struct device *dev,
 
 static struct class *backlight_class;
 
-static int backlight_suspend(struct device *dev, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int backlight_suspend(struct device *dev)
 {
        struct backlight_device *bd = to_backlight_device(dev);
 
@@ -235,6 +236,10 @@ static int backlight_resume(struct device *dev)
 
        return 0;
 }
+#endif
+
+static SIMPLE_DEV_PM_OPS(backlight_class_dev_pm_ops, backlight_suspend,
+                        backlight_resume);
 
 static void bl_device_release(struct device *dev)
 {
@@ -489,8 +494,7 @@ static int __init backlight_class_init(void)
        }
 
        backlight_class->dev_attrs = bl_device_attributes;
-       backlight_class->suspend = backlight_suspend;
-       backlight_class->resume = backlight_resume;
+       backlight_class->pm = &backlight_class_dev_pm_ops;
        return 0;
 }