Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / video / backlight / locomolcd.c

diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index 146fea8aa43167c3dc67b995d1f0e1e14f7c5994..6c3ec4259a601e0d37ecd1f04a1fed0936d1a8f9 100644 (file)
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -157,25 +157,24 @@ static const struct backlight_ops locomobl_data = {
        .update_status  = locomolcd_set_intensity,
 };
 
-#ifdef CONFIG_PM
-static int locomolcd_suspend(struct locomo_dev *dev, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int locomolcd_suspend(struct device *dev)
 {
        locomolcd_flags |= LOCOMOLCD_SUSPENDED;
        locomolcd_set_intensity(locomolcd_bl_device);
        return 0;
 }
 
-static int locomolcd_resume(struct locomo_dev *dev)
+static int locomolcd_resume(struct device *dev)
 {
        locomolcd_flags &= ~LOCOMOLCD_SUSPENDED;
        locomolcd_set_intensity(locomolcd_bl_device);
        return 0;
 }
-#else
-#define locomolcd_suspend      NULL
-#define locomolcd_resume       NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(locomolcd_pm_ops, locomolcd_suspend, locomolcd_resume);
+
 static int locomolcd_probe(struct locomo_dev *ldev)
 {
        struct backlight_properties props;
@@ -230,13 +229,12 @@ static int locomolcd_remove(struct locomo_dev *dev)
 
 static struct locomo_driver poodle_lcd_driver = {
        .drv = {
-               .name = "locomo-backlight",
+               .name   = "locomo-backlight",
+               .pm     = &locomolcd_pm_ops,
        },
        .devid  = LOCOMO_DEVID_BACKLIGHT,
        .probe  = locomolcd_probe,
        .remove = locomolcd_remove,
-       .suspend = locomolcd_suspend,
-       .resume = locomolcd_resume,
 };
 
 static int __init locomolcd_init(void)