The patch titled rtc_cmos: convert shutdown to new pnp_driver->shutdown has been added to the -mm tree. Its filename is rtc_cmos-convert-shutdown-to-new-pnp_driver-shutdown.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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: rtc_cmos: convert shutdown to new pnp_driver->shutdown From: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx> commit abd6633c67925f90775bb74755f9c547e30f1f20 ("pnp: add a shutdown method to pnp drivers") adds shutdown method to bus driver blindly. With it, driver->shutdown is no longer valid. Use pnp_driver->shutdown instead. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14889 Signed-off-by: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx> Reported-by: Malte Schröder <maltesch@xxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx> Cc: David Hardeman <david@xxxxxxxxxxx> Cc: Dmitry Torokhov <dtor@xxxxxxx> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Cc: Paul Gortmaker <p_gortmaker@xxxxxxxxx> Cc: <stable@xxxxxxxxxx> [2.6.32.x] Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-cmos.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff -puN drivers/rtc/rtc-cmos.c~rtc_cmos-convert-shutdown-to-new-pnp_driver-shutdown drivers/rtc/rtc-cmos.c --- a/drivers/rtc/rtc-cmos.c~rtc_cmos-convert-shutdown-to-new-pnp_driver-shutdown +++ a/drivers/rtc/rtc-cmos.c @@ -1096,9 +1096,9 @@ static int cmos_pnp_resume(struct pnp_de #define cmos_pnp_resume NULL #endif -static void cmos_pnp_shutdown(struct device *pdev) +static void cmos_pnp_shutdown(struct pnp_dev *pnp) { - if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(pdev)) + if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(&pnp->dev)) return; cmos_do_shutdown(); @@ -1117,15 +1117,12 @@ static struct pnp_driver cmos_pnp_driver .id_table = rtc_ids, .probe = cmos_pnp_probe, .remove = __exit_p(cmos_pnp_remove), + .shutdown = cmos_pnp_shutdown, /* flag ensures resume() gets called, and stops syslog spam */ .flags = PNP_DRIVER_RES_DO_NOT_CHANGE, .suspend = cmos_pnp_suspend, .resume = cmos_pnp_resume, - .driver = { - .name = (char *)driver_name, - .shutdown = cmos_pnp_shutdown, - } }; #endif /* CONFIG_PNP */ _ Patches currently in -mm which might be from hirofumi@xxxxxxxxxxxxxxxxxx are origin.patch rtc_cmos-convert-shutdown-to-new-pnp_driver-shutdown.patch tpm_infineon-fix-suspend-resume-handler-for-pnp_driver.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