hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rtc_cmos: convert shutdown to new pnp_driver->shutdown 

commit abd6633c67 ("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@mail.parknet.co.jp>
Reported-by: Malte Schröder <maltesch@gmx.de>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: David Hardeman <david@hardeman.nu>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Cc: <stable@kernel.org>		[2.6.32.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
OGAWA Hirofumi 2010-01-08 14:43:11 -08:00 committed by Linus Torvalds
parent 7f53a09ed4
commit 004731b2c7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/rtc/rtc-cmos.c
View File

@ -1096,9 +1096,9 @@ static int cmos_pnp_resume(struct pnp_dev *pnp)
#define cmos_pnp_resume NULL #define cmos_pnp_resume NULL
#endif #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; return;
cmos_do_shutdown(); cmos_do_shutdown();
@ -1117,15 +1117,12 @@ static struct pnp_driver cmos_pnp_driver = {
.id_table = rtc_ids, .id_table = rtc_ids,
.probe = cmos_pnp_probe, .probe = cmos_pnp_probe,
.remove = __exit_p(cmos_pnp_remove), .remove = __exit_p(cmos_pnp_remove),
.shutdown = cmos_pnp_shutdown,
/* flag ensures resume() gets called, and stops syslog spam */ /* flag ensures resume() gets called, and stops syslog spam */
.flags = PNP_DRIVER_RES_DO_NOT_CHANGE, .flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
.suspend = cmos_pnp_suspend, .suspend = cmos_pnp_suspend,
.resume = cmos_pnp_resume, .resume = cmos_pnp_resume,
.driver = {
.name = (char *)driver_name,
.shutdown = cmos_pnp_shutdown,
}
}; };
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */