The patch titled Subject: drivers/rtc/rtc-tps65910.c: use sleep_pm_ops macro for initialising suspend/resume callbacks has been added to the -mm tree. Its filename is drivers-rtc-rtc-tps65910c-use-sleep_pm_ops-macro-for-initialising-suspend-resume-callbacks.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: Laxman Dewangan <ldewangan@xxxxxxxxxx> Subject: drivers/rtc/rtc-tps65910.c: use sleep_pm_ops macro for initialising suspend/resume callbacks Use SET_SYSTEM_SLEEP_PM_OPS for setting suspend/resume callbacks for dev_pm_ops. Signed-off-by: Laxman Dewangan <ldewangan@xxxxxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-tps65910.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff -puN drivers/rtc/rtc-tps65910.c~drivers-rtc-rtc-tps65910c-use-sleep_pm_ops-macro-for-initialising-suspend-resume-callbacks drivers/rtc/rtc-tps65910.c --- a/drivers/rtc/rtc-tps65910.c~drivers-rtc-rtc-tps65910c-use-sleep_pm_ops-macro-for-initialising-suspend-resume-callbacks +++ a/drivers/rtc/rtc-tps65910.c @@ -22,6 +22,7 @@ #include <linux/rtc.h> #include <linux/bcd.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/interrupt.h> #include <linux/mfd/tps65910.h> @@ -304,7 +305,6 @@ static int tps65910_rtc_remove(struct pl } #ifdef CONFIG_PM_SLEEP - static int tps65910_rtc_suspend(struct device *dev) { struct tps65910_rtc *tps_rtc = dev_get_drvdata(dev); @@ -322,24 +322,19 @@ static int tps65910_rtc_resume(struct de disable_irq_wake(tps_rtc->irq); return 0; } +#endif static const struct dev_pm_ops tps65910_rtc_pm_ops = { - .suspend = tps65910_rtc_suspend, - .resume = tps65910_rtc_resume, + SET_SYSTEM_SLEEP_PM_OPS(tps65910_rtc_suspend, tps65910_rtc_resume) }; -#define DEV_PM_OPS (&tps65910_rtc_pm_ops) -#else -#define DEV_PM_OPS NULL -#endif - static struct platform_driver tps65910_rtc_driver = { .probe = tps65910_rtc_probe, .remove = tps65910_rtc_remove, .driver = { .owner = THIS_MODULE, .name = "tps65910-rtc", - .pm = DEV_PM_OPS, + .pm = &tps65910_rtc_pm_ops, }, }; _ Patches currently in -mm which might be from ldewangan@xxxxxxxxxx are origin.patch linux-next.patch rtc-add-rtc-driver-for-tps80031-tps80032.patch rtc-add-rtc-driver-for-tps80031-tps80032-v2.patch rtc-add-rtc-driver-for-tps80031-tps80032-v2-fix.patch drivers-rtc-rtc-tps65910c-enable-disable-wake-in-suspend-resume.patch drivers-rtc-rtc-tps65910c-remove-unnecessary-irq-stat-save-and-restore.patch drivers-rtc-rtc-tps65910c-use-sleep_pm_ops-macro-for-initialising-suspend-resume-callbacks.patch drivers-rtc-rtc-tps65910c-set-irq-flag-to-irqf_early_resume-during-irq-request.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