The patch titled Subject: drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix has been added to the -mm tree. Its filename is drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix.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: Jingoo Han <jg1.han@xxxxxxxxxxx> Subject: drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix - Remove unnecessary ifdefs. Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/backlight/ams369fg06.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/video/backlight/ams369fg06.c~drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix drivers/video/backlight/ams369fg06.c --- a/drivers/video/backlight/ams369fg06.c~drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix +++ a/drivers/video/backlight/ams369fg06.c @@ -533,7 +533,7 @@ static int ams369fg06_remove(struct spi_ return 0; } -#if defined(CONFIG_PM) +#ifdef CONFIG_PM_SLEEP static int ams369fg06_suspend(struct device *dev) { struct ams369fg06 *lcd = dev_get_drvdata(dev); @@ -555,10 +555,10 @@ static int ams369fg06_resume(struct devi return ams369fg06_power(lcd, FB_BLANK_UNBLANK); } +#endif static SIMPLE_DEV_PM_OPS(ams369fg06_pm_ops, ams369fg06_suspend, ams369fg06_resume); -#endif static void ams369fg06_shutdown(struct spi_device *spi) { @@ -571,9 +571,7 @@ static struct spi_driver ams369fg06_driv .driver = { .name = "ams369fg06", .owner = THIS_MODULE, -#ifdef CONFIG_PM .pm = &ams369fg06_pm_ops, -#endif }, .probe = ams369fg06_probe, .remove = ams369fg06_remove, _ Patches currently in -mm which might be from jg1.han@xxxxxxxxxxx are origin.patch linux-next.patch backlight-ams369fg06-make-power_on-call-optional.patch lib-devresc-fix-misplaced-endif.patch drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops.patch drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix.patch backlight-platform_lcd-remove-unnecessary-ifdefs.patch rtc-rtc-v3020-use-gpio_request_array.patch rtc-add-devm_rtc_device_registerunregister.patch rtc-rtc-palmas-use-devm_request_threaded_irq.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