Commit 004731b2 authored Jan 08, 2010 by OGAWA Hirofumi Committed by Linus Torvalds Jan 11, 2010

rtc_cmos: convert shutdown to new pnp_driver->shutdown

commit abd6633c ("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>

parent 7f53a09e

drivers/rtc/rtc-cmos.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -1096,9 +1096,9 @@ static int cmos_pnp_resume(struct pnp_dev *pnp)
		#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 */

Admin message