diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-10 18:09:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 19:30:48 -0500 |
commit | e2c17bc6f717a8847df2a867caec6ba4fe85f3fc (patch) | |
tree | 9e0014d520c8b83601968da292d080fda8bb7e52 | |
parent | 48e78e8cc87ab80617ef0c5a146701ca96a4a51d (diff) |
backlight: convert pwm_bl to dev_pm_ops
Should be no functional changes, mainly a reorganisation to support future
work.
[akpm@linux-foundation.org: fix CONFIG_PM=n build]
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/backlight/pwm_bl.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index b811e8fb4062..7496d04e1d3c 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c | |||
@@ -169,10 +169,9 @@ static int pwm_backlight_remove(struct platform_device *pdev) | |||
169 | } | 169 | } |
170 | 170 | ||
171 | #ifdef CONFIG_PM | 171 | #ifdef CONFIG_PM |
172 | static int pwm_backlight_suspend(struct platform_device *pdev, | 172 | static int pwm_backlight_suspend(struct device *dev) |
173 | pm_message_t state) | ||
174 | { | 173 | { |
175 | struct backlight_device *bl = platform_get_drvdata(pdev); | 174 | struct backlight_device *bl = dev_get_drvdata(dev); |
176 | struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev); | 175 | struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev); |
177 | 176 | ||
178 | if (pb->notify) | 177 | if (pb->notify) |
@@ -184,27 +183,29 @@ static int pwm_backlight_suspend(struct platform_device *pdev, | |||
184 | return 0; | 183 | return 0; |
185 | } | 184 | } |
186 | 185 | ||
187 | static int pwm_backlight_resume(struct platform_device *pdev) | 186 | static int pwm_backlight_resume(struct device *dev) |
188 | { | 187 | { |
189 | struct backlight_device *bl = platform_get_drvdata(pdev); | 188 | struct backlight_device *bl = dev_get_drvdata(dev); |
190 | 189 | ||
191 | backlight_update_status(bl); | 190 | backlight_update_status(bl); |
192 | return 0; | 191 | return 0; |
193 | } | 192 | } |
194 | #else | 193 | |
195 | #define pwm_backlight_suspend NULL | 194 | static SIMPLE_DEV_PM_OPS(pwm_backlight_pm_ops, pwm_backlight_suspend, |
196 | #define pwm_backlight_resume NULL | 195 | pwm_backlight_resume); |
196 | |||
197 | #endif | 197 | #endif |
198 | 198 | ||
199 | static struct platform_driver pwm_backlight_driver = { | 199 | static struct platform_driver pwm_backlight_driver = { |
200 | .driver = { | 200 | .driver = { |
201 | .name = "pwm-backlight", | 201 | .name = "pwm-backlight", |
202 | .owner = THIS_MODULE, | 202 | .owner = THIS_MODULE, |
203 | #ifdef CONFIG_PM | ||
204 | .pm = &pwm_backlight_pm_ops, | ||
205 | #endif | ||
203 | }, | 206 | }, |
204 | .probe = pwm_backlight_probe, | 207 | .probe = pwm_backlight_probe, |
205 | .remove = pwm_backlight_remove, | 208 | .remove = pwm_backlight_remove, |
206 | .suspend = pwm_backlight_suspend, | ||
207 | .resume = pwm_backlight_resume, | ||
208 | }; | 209 | }; |
209 | 210 | ||
210 | module_platform_driver(pwm_backlight_driver); | 211 | module_platform_driver(pwm_backlight_driver); |