From: David Brownell Small driver suspend() fixes in preparation for the PRETHAW events: - Only compare message events for equality against PM_EVENT_* codes; not against integers, or using greater/less-than comparisons. (PM_EVENT_* should really become a __bitwise thing.) - Explicitly test for SUSPEND events (rather than not-something-else) before suspending devices. - Removes more of the confusion between a pm_message_t (wraps event code) and a "state" ... suspend() originally took a target system state. These updates are correct and appropriate even without new PM_EVENT codes. benh: "I think in the Mesh case, we should handle the freeze case as well or we might get wild DMA." Signed-off-by: David Brownell Acked-by: Pavel Machek Cc: Greg KH Cc: Jeff Garzik Cc: Tejun Heo Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Mauro Carvalho Chehab Cc: James Bottomley Signed-off-by: Andrew Morton --- drivers/ide/ppc/pmac.c | 14 ++++++++------ drivers/media/dvb/cinergyT2/cinergyT2.c | 2 +- drivers/scsi/libata-core.c | 9 +++++---- drivers/scsi/mesh.c | 15 +++++++++++---- 4 files changed, 25 insertions(+), 15 deletions(-) diff -puN drivers/ide/ppc/pmac.c~fix-broken-dubious-driver-suspend-methods drivers/ide/ppc/pmac.c --- a/drivers/ide/ppc/pmac.c~fix-broken-dubious-driver-suspend-methods +++ a/drivers/ide/ppc/pmac.c @@ -1495,15 +1495,16 @@ pmac_ide_macio_attach(struct macio_dev * } static int -pmac_ide_macio_suspend(struct macio_dev *mdev, pm_message_t state) +pmac_ide_macio_suspend(struct macio_dev *mdev, pm_message_t mesg) { ide_hwif_t *hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev); int rc = 0; - if (state.event != mdev->ofdev.dev.power.power_state.event && state.event >= PM_EVENT_SUSPEND) { + if (mesg.event != mdev->ofdev.dev.power.power_state.event + && mesg.event == PM_EVENT_SUSPEND) { rc = pmac_ide_do_suspend(hwif); if (rc == 0) - mdev->ofdev.dev.power.power_state = state; + mdev->ofdev.dev.power.power_state = mesg; } return rc; @@ -1599,15 +1600,16 @@ pmac_ide_pci_attach(struct pci_dev *pdev } static int -pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t state) +pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg) { ide_hwif_t *hwif = (ide_hwif_t *)pci_get_drvdata(pdev); int rc = 0; - if (state.event != pdev->dev.power.power_state.event && state.event >= 2) { + if (mesg.event != pdev->dev.power.power_state.event + && mesg.event == PM_EVENT_SUSPEND) { rc = pmac_ide_do_suspend(hwif); if (rc == 0) - pdev->dev.power.power_state = state; + pdev->dev.power.power_state = mesg; } return rc; diff -puN drivers/media/dvb/cinergyT2/cinergyT2.c~fix-broken-dubious-driver-suspend-methods drivers/media/dvb/cinergyT2/cinergyT2.c --- a/drivers/media/dvb/cinergyT2/cinergyT2.c~fix-broken-dubious-driver-suspend-methods +++ a/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -982,7 +982,7 @@ static int cinergyt2_suspend (struct usb if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) return -ERESTARTSYS; - if (state.event > PM_EVENT_ON) { + if (1) { struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf); cinergyt2_suspend_rc(cinergyt2); diff -puN drivers/scsi/libata-core.c~fix-broken-dubious-driver-suspend-methods drivers/scsi/libata-core.c --- a/drivers/scsi/libata-core.c~fix-broken-dubious-driver-suspend-methods +++ a/drivers/scsi/libata-core.c @@ -5032,12 +5032,12 @@ int ata_device_resume(struct ata_device /** * ata_device_suspend - prepare a device for suspend * @dev: the device to suspend - * @state: target power management state + * @mesg: power management event * * Flush the cache on the drive, if appropriate, then issue a * standbynow command. */ -int ata_device_suspend(struct ata_device *dev, pm_message_t state) +int ata_device_suspend(struct ata_device *dev, pm_message_t mesg) { struct ata_port *ap = dev->ap; @@ -5046,9 +5046,10 @@ int ata_device_suspend(struct ata_device if (dev->class == ATA_DEV_ATA) ata_flush_cache(dev); - if (state.event != PM_EVENT_FREEZE) + if (mesg.event == PM_EVENT_SUSPEND) { ata_standby_drive(dev); - ap->flags |= ATA_FLAG_SUSPENDED; + ap->flags |= ATA_FLAG_SUSPENDED; + } return 0; } diff -puN drivers/scsi/mesh.c~fix-broken-dubious-driver-suspend-methods drivers/scsi/mesh.c --- a/drivers/scsi/mesh.c~fix-broken-dubious-driver-suspend-methods +++ a/drivers/scsi/mesh.c @@ -1757,16 +1757,23 @@ static void set_mesh_power(struct mesh_s pmac_call_feature(PMAC_FTR_MESH_ENABLE, macio_get_of_node(ms->mdev), 0, 0); msleep(10); } -} +} #ifdef CONFIG_PM -static int mesh_suspend(struct macio_dev *mdev, pm_message_t state) +static int mesh_suspend(struct macio_dev *mdev, pm_message_t mesg) { struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev); unsigned long flags; - if (state.event == mdev->ofdev.dev.power.power_state.event || state.event < 2) + switch (mesg.event) { + case PM_EVENT_SUSPEND: + case PM_EVENT_FREEZE: + break; + default: + return 0; + } + if (mesg.event == mdev->ofdev.dev.power.power_state.event) return 0; scsi_block_requests(ms->host); @@ -1781,7 +1788,7 @@ static int mesh_suspend(struct macio_dev disable_irq(ms->meshintr); set_mesh_power(ms, 0); - mdev->ofdev.dev.power.power_state = state; + mdev->ofdev.dev.power.power_state = mesg; return 0; } _