Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b4b8a24 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

fix broken/dubious driver suspend() methods 



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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: Greg KH <greg@kroah.com>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8f4bcc20

drivers/ide/ppc/pmac.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -1369,15 +1369,16 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) 
}

}





static int

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);

	ide_hwif_t	*hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev);

	int		rc = 0;

	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);

		rc = pmac_ide_do_suspend(hwif);

		if (rc == 0)

		if (rc == 0)

			mdev->ofdev.dev.power.power_state = state;

			mdev->ofdev.dev.power.power_state = mesg;

	}

	}





	return rc;

	return rc;
@@ -1473,15 +1474,16 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
}

}





static int

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);

	ide_hwif_t	*hwif = (ide_hwif_t *)pci_get_drvdata(pdev);

	int		rc = 0;

	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);

		rc = pmac_ide_do_suspend(hwif);

		if (rc == 0)

		if (rc == 0)

			pdev->dev.power.power_state = state;

			pdev->dev.power.power_state = mesg;

	}

	}





	return rc;

	return rc;

drivers/media/dvb/cinergyT2/cinergyT2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -981,7 +981,7 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state) 
	if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))

	if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem))

		return -ERESTARTSYS;

		return -ERESTARTSYS;





	if (state.event > PM_EVENT_ON) {

	if (1) {

		struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);

		struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);





		cinergyt2_suspend_rc(cinergyt2);

		cinergyt2_suspend_rc(cinergyt2);

drivers/scsi/mesh.c

+11 −4
Original line number Original line Diff line number Diff line
@@ -1760,12 +1760,19 @@ static void set_mesh_power(struct mesh_state *ms, int state) 








#ifdef CONFIG_PM

#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);

	struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev);

	unsigned long flags;

	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;

		return 0;





	scsi_block_requests(ms->host);

	scsi_block_requests(ms->host);
@@ -1780,7 +1787,7 @@ static int mesh_suspend(struct macio_dev *mdev, pm_message_t state) 
	disable_irq(ms->meshintr);

	disable_irq(ms->meshintr);

	set_mesh_power(ms, 0);

	set_mesh_power(ms, 0);





	mdev->ofdev.dev.power.power_state = state;

	mdev->ofdev.dev.power.power_state = mesg;





	return 0;

	return 0;

}

}