PCI/PM: Clear PCIe PME Status bit in core, not PCIe port driver

[muen/linux.git] / drivers / pci / pcie / portdrv_pci.c

diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index d6f10a97d4008e8d16bd6fb94aced8c4cb0004f8..ec9e936c2a5b1a7d9d11988f89c16779431cc59e 100644 (file)
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -61,20 +61,6 @@ static int pcie_portdrv_restore_config(struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PM
-static int pcie_port_resume_noirq(struct device *dev)
-{
-       struct pci_dev *pdev = to_pci_dev(dev);
-
-       /*
-        * Some BIOSes forget to clear Root PME Status bits after system wakeup
-        * which breaks ACPI-based runtime wakeup on PCI Express, so clear those
-        * bits now just in case (shouldn't hurt).
-        */
-       if (pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT)
-               pcie_clear_root_pme_status(pdev);
-       return 0;
-}
-
 static int pcie_port_runtime_suspend(struct device *dev)
 {
        return to_pci_dev(dev)->bridge_d3 ? 0 : -EBUSY;
@@ -102,7 +88,6 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops = {
        .thaw           = pcie_port_device_resume,
        .poweroff       = pcie_port_device_suspend,
        .restore        = pcie_port_device_resume,
-       .resume_noirq   = pcie_port_resume_noirq,
        .runtime_suspend = pcie_port_runtime_suspend,
        .runtime_resume = pcie_port_runtime_resume,
        .runtime_idle   = pcie_port_runtime_idle,