]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
backlight: convert from legacy pm ops to dev_pm_ops
authorShuah Khan <shuah.kh@samsung.com>
Wed, 19 Jun 2013 00:07:14 +0000 (10:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 07:27:01 +0000 (17:27 +1000)
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.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Cc: Shuah Khan <shuahkhan@gmail.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/video/backlight/backlight.c

index 53c52fbc93955d2b58dc9dfa6538d54216e3f3a3..bc6585bb5feaa1dac6739dba154c14795473152c 100644 (file)
@@ -208,7 +208,7 @@ 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)
+static int backlight_suspend(struct device *dev)
 {
        struct backlight_device *bd = to_backlight_device(dev);
 
@@ -236,6 +236,9 @@ static int backlight_resume(struct device *dev)
        return 0;
 }
 
+static SIMPLE_DEV_PM_OPS(backlight_class_dev_pm_ops, backlight_suspend,
+                        backlight_resume);
+
 static void bl_device_release(struct device *dev)
 {
        struct backlight_device *bd = to_backlight_device(dev);
@@ -489,8 +492,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;
 }