Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mark Brown and committed by
Linus Torvalds
e2c17bc6 48e78e8c

+11 -10
+11 -10
drivers/video/backlight/pwm_bl.c
··· 169 169 } 170 170 171 171 #ifdef CONFIG_PM 172 - static int pwm_backlight_suspend(struct platform_device *pdev, 173 - pm_message_t state) 172 + static int pwm_backlight_suspend(struct device *dev) 174 173 { 175 - struct backlight_device *bl = platform_get_drvdata(pdev); 174 + struct backlight_device *bl = dev_get_drvdata(dev); 176 175 struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev); 177 176 178 177 if (pb->notify) ··· 183 184 return 0; 184 185 } 185 186 186 - static int pwm_backlight_resume(struct platform_device *pdev) 187 + static int pwm_backlight_resume(struct device *dev) 187 188 { 188 - struct backlight_device *bl = platform_get_drvdata(pdev); 189 + struct backlight_device *bl = dev_get_drvdata(dev); 189 190 190 191 backlight_update_status(bl); 191 192 return 0; 192 193 } 193 - #else 194 - #define pwm_backlight_suspend NULL 195 - #define pwm_backlight_resume NULL 194 + 195 + static SIMPLE_DEV_PM_OPS(pwm_backlight_pm_ops, pwm_backlight_suspend, 196 + pwm_backlight_resume); 197 + 196 198 #endif 197 199 198 200 static struct platform_driver pwm_backlight_driver = { 199 201 .driver = { 200 202 .name = "pwm-backlight", 201 203 .owner = THIS_MODULE, 204 + #ifdef CONFIG_PM 205 + .pm = &pwm_backlight_pm_ops, 206 + #endif 202 207 }, 203 208 .probe = pwm_backlight_probe, 204 209 .remove = pwm_backlight_remove, 205 - .suspend = pwm_backlight_suspend, 206 - .resume = pwm_backlight_resume, 207 210 }; 208 211 209 212 module_platform_driver(pwm_backlight_driver);