The patch titled Subject: backlight: convert pwm_bl to dev_pm_ops has been added to the -mm tree. Its filename is backlight-convert-pwm_bl-to-dev_pm_ops.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Subject: backlight: convert pwm_bl to dev_pm_ops Should be no functional changes, mainly a reorganisation to support future work. Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Cc: Richard Purdie <rpurdie@xxxxxxxxx> Cc: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/backlight/pwm_bl.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff -puN drivers/video/backlight/pwm_bl.c~backlight-convert-pwm_bl-to-dev_pm_ops drivers/video/backlight/pwm_bl.c --- a/drivers/video/backlight/pwm_bl.c~backlight-convert-pwm_bl-to-dev_pm_ops +++ a/drivers/video/backlight/pwm_bl.c @@ -169,10 +169,9 @@ static int pwm_backlight_remove(struct p } #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 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; } + +static SIMPLE_DEV_PM_OPS(pwm_backlight_pm_ops, pwm_backlight_suspend, + pwm_backlight_resume); + #else -#define pwm_backlight_suspend NULL -#define pwm_backlight_resume NULL +#define pwm_backlight_pm_ops NULL #endif static struct platform_driver pwm_backlight_driver = { .driver = { .name = "pwm-backlight", .owner = THIS_MODULE, + .pm = &pwm_backlight_pm_ops, }, .probe = pwm_backlight_probe, .remove = pwm_backlight_remove, - .suspend = pwm_backlight_suspend, - .resume = pwm_backlight_resume, }; module_platform_driver(pwm_backlight_driver); _ Subject: Subject: backlight: convert pwm_bl to dev_pm_ops Patches currently in -mm which might be from broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx are origin.patch linux-next.patch backlight-convert-drivers-video-backlight-to-use-module_platform_driver.patch backlight-convert-platform_lcd-to-devm_kzalloc.patch backlight-convert-pwm_bl-to-dev_pm_ops.patch backlight-convert-pwm_bl-to-dev_pm_ops-fix.patch leds-convert-led-platform-drivers-to-module_platform_driver.patch leds-convert-led-i2c-drivers-to-module_i2c_driver.patch leds-convert-leds-dac124s085-to-module_spi_driver.patch leds-convert-wm831x-status-driver-to-devm_kzalloc.patch leds-convert-wm8350-driver-to-devm_kzalloc.patch drivers-rtc-rtc-wm831xc-remove-unused-period-irq-handler.patch drivers-rtc-rtc-wm831xc-convert-to-devm_kzalloc.patch rtc-convert-drivers-rtc-to-use-module_platform_driver.patch drivers-rtc-interfacec-fix-alarm-rollover-when-day-or-month-is-out-of-range.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html