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

Commit d3535fbb authored by John W. Linville's avatar John W. Linville Committed by Greg Kroah-Hartman
Browse files

[PATCH] pci: cleanup need_restore switch statement 



Cleanup the need_restore switch statement in
pci_set_power_state(). This makes it more safe by explicitly handling
all the PCI power states instead of handling them as the default
case. It also reads a little better IMHO.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b30197d2

drivers/pci/pci.c

+7 −7
Original line number Diff line number Diff line
@@ -314,19 +314,19 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state) 
	 * sets PowerState to 0.

	 */

	switch (dev->current_state) {

	case PCI_D0:

	case PCI_D1:

	case PCI_D2:

		pmcsr &= ~PCI_PM_CTRL_STATE_MASK;

		pmcsr |= state;

		break;

	case PCI_UNKNOWN: /* Boot-up */

		if ((pmcsr & PCI_PM_CTRL_STATE_MASK) == PCI_D3hot

		 && !(pmcsr & PCI_PM_CTRL_NO_SOFT_RESET))

			need_restore = 1;

		/* Fall-through: force to D0 */

	case PCI_D3hot:

	case PCI_D3cold:

	case PCI_POWER_ERROR:

		pmcsr = 0;

		break;

	default:

		pmcsr &= ~PCI_PM_CTRL_STATE_MASK;

		pmcsr |= state;

		pmcsr = 0;

		break;

	}