From 3bb074d7d2c43e332e0ffba80bb335719e92180e Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 10 Jan 2012 15:09:22 -0800
Subject: [PATCH] --- yaml --- r: 283055 b: refs/heads/master c:
 e2c17bc6f717a8847df2a867caec6ba4fe85f3fc h: refs/heads/master i:   283053:
 ca42d8b10b0e68291551565bc5a7a99293662f75   283051:
 9c72e11cf867cd86bcf781c947581d554efd7e10   283047:
 8e1c5f2e588ad2641cb84dc4112a98ba9d3e2496   283039:
 69394f022427a3b3943f1c2b31ba33dcde898985 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/video/backlight/pwm_bl.c | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 461df6e478dc..3e7507f4a56c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48e78e8cc87ab80617ef0c5a146701ca96a4a51d
+refs/heads/master: e2c17bc6f717a8847df2a867caec6ba4fe85f3fc
diff --git a/trunk/drivers/video/backlight/pwm_bl.c b/trunk/drivers/video/backlight/pwm_bl.c
index b811e8fb4062..7496d04e1d3c 100644
--- a/trunk/drivers/video/backlight/pwm_bl.c
+++ b/trunk/drivers/video/backlight/pwm_bl.c
@@ -169,10 +169,9 @@ static int pwm_backlight_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int pwm_backlight_suspend(struct platform_device *pdev,
-				 pm_message_t state)
+static int pwm_backlight_suspend(struct device *dev)
 {
-	struct backlight_device *bl = platform_get_drvdata(pdev);
+	struct backlight_device *bl = dev_get_drvdata(dev);
 	struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);
 
 	if (pb->notify)
@@ -184,27 +183,29 @@ static int pwm_backlight_suspend(struct platform_device *pdev,
 	return 0;
 }
 
-static int pwm_backlight_resume(struct platform_device *pdev)
+static int pwm_backlight_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 pwm_backlight_suspend	NULL
-#define pwm_backlight_resume	NULL
+
+static SIMPLE_DEV_PM_OPS(pwm_backlight_pm_ops, pwm_backlight_suspend,
+			 pwm_backlight_resume);
+
 #endif
 
 static struct platform_driver pwm_backlight_driver = {
 	.driver		= {
 		.name	= "pwm-backlight",
 		.owner	= THIS_MODULE,
+#ifdef CONFIG_PM
+		.pm	= &pwm_backlight_pm_ops,
+#endif
 	},
 	.probe		= pwm_backlight_probe,
 	.remove		= pwm_backlight_remove,
-	.suspend	= pwm_backlight_suspend,
-	.resume		= pwm_backlight_resume,
 };
 
 module_platform_driver(pwm_backlight_driver);