Patchwork [-v7,3/4] PCI, do not call pci_set_power_state with PCI_D3cold

login
register
mail settings
Submitter Huang Ying
Date June 23, 2012, 2:23 a.m.
Message ID <1340418231-10134-4-git-send-email-ying.huang@intel.com>
Download mbox | patch
Permalink /patch/166728/
State Accepted
Headers show

Comments

Huang Ying - June 23, 2012, 2:23 a.m.
PCI subsystem has not been ready for D3cold support yet.  So
PCI_D3cold should not be used as parameter for pci_set_power_state.
This patch is needed for upcoming PCI_D3cold support.

This patch has no functionality change, because pci_set_power_state
will bound the parameter to PCI_D3hot too.

Cc: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
Cc: Jesse Barnes <jesse.barnes@intel.com>
Signed-off-by: Huang Ying <ying.huang@intel.com>
Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 arch/x86/pci/mrst.c       |    2 +-
 drivers/misc/cb710/core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/arch/x86/pci/mrst.c
+++ b/arch/x86/pci/mrst.c
@@ -264,7 +264,7 @@  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
 
 static void __devinit mrst_power_off_unused_dev(struct pci_dev *dev)
 {
-	pci_set_power_state(dev, PCI_D3cold);
+	pci_set_power_state(dev, PCI_D3hot);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0801, mrst_power_off_unused_dev);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0809, mrst_power_off_unused_dev);
--- a/drivers/misc/cb710/core.c
+++ b/drivers/misc/cb710/core.c
@@ -180,7 +180,7 @@  static int cb710_suspend(struct pci_dev
 	pci_save_state(pdev);
 	pci_disable_device(pdev);
 	if (state.event & PM_EVENT_SLEEP)
-		pci_set_power_state(pdev, PCI_D3cold);
+		pci_set_power_state(pdev, PCI_D3hot);
 	return 0;
 }