2 files changed, 4 insertions, 63 deletions

diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index a63bd8f72601..1d317d22ee89 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -29,7 +29,6 @@
 
 struct pcie_port_device_ext {
         int interrupt_mode;     /* [0:INTx | 1:MSI | 2:MSI-X] */
-        unsigned int saved_msi_config_space[5];
 };
 
 extern struct bus_type pcie_port_bus_type;
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 02260141dc81..50bfc1b2f3bf 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -30,75 +30,16 @@ MODULE_LICENSE("GPL");
 /* global data */
 static const char device_name[] = "pcieport-driver";
 
-static void pci_save_msi_state(struct pci_dev *dev)
+static int pcie_portdrv_save_config(struct pci_dev *dev)
 {
-        struct pcie_port_device_ext *p_ext = pci_get_drvdata(dev);
-        int i = 0, pos;
-        u16 control;
-
-        if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSI)) <= 0)
-                return;
-
-        pci_read_config_dword(dev, pos, &p_ext->saved_msi_config_space[i++]);
-        control = p_ext->saved_msi_config_space[0] >> 16;
-        pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_LO,
-                &p_ext->saved_msi_config_space[i++]);
-        if (control & PCI_MSI_FLAGS_64BIT) {
-                pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
-                        &p_ext->saved_msi_config_space[i++]);
-                pci_read_config_dword(dev, pos + PCI_MSI_DATA_64,
-                        &p_ext->saved_msi_config_space[i++]);
-        } else
-                pci_read_config_dword(dev, pos + PCI_MSI_DATA_32,
-                        &p_ext->saved_msi_config_space[i++]);
-        if (control & PCI_MSI_FLAGS_MASKBIT)
-                pci_read_config_dword(dev, pos + PCI_MSI_MASK_BIT,
-                        &p_ext->saved_msi_config_space[i++]);
-}
-
-static void pci_restore_msi_state(struct pci_dev *dev)
-{
-        struct pcie_port_device_ext *p_ext = pci_get_drvdata(dev);
-        int i = 0, pos;
-        u16 control;
-
-        if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSI)) <= 0)
-                return;
-
-        control = p_ext->saved_msi_config_space[i++] >> 16;
-        pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control);
-        pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_LO,
-                p_ext->saved_msi_config_space[i++]);
-        if (control & PCI_MSI_FLAGS_64BIT) {
-                pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
-                        p_ext->saved_msi_config_space[i++]);
-                pci_write_config_dword(dev, pos + PCI_MSI_DATA_64,
-                        p_ext->saved_msi_config_space[i++]);
-        } else
-                pci_write_config_dword(dev, pos + PCI_MSI_DATA_32,
-                        p_ext->saved_msi_config_space[i++]);
-        if (control & PCI_MSI_FLAGS_MASKBIT)
-                pci_write_config_dword(dev, pos + PCI_MSI_MASK_BIT,
-                        p_ext->saved_msi_config_space[i++]);
-}
-
-static void pcie_portdrv_save_config(struct pci_dev *dev)
-{
-        struct pcie_port_device_ext *p_ext = pci_get_drvdata(dev);
-
-        pci_save_state(dev);
-        if (p_ext->interrupt_mode == PCIE_PORT_MSI_MODE)
-                pci_save_msi_state(dev);
+        return pci_save_state(dev);
 }
 
 static int pcie_portdrv_restore_config(struct pci_dev *dev)
 {
-        struct pcie_port_device_ext *p_ext = pci_get_drvdata(dev);
         int retval;
 
         pci_restore_state(dev);
-        if (p_ext->interrupt_mode == PCIE_PORT_MSI_MODE)
-                pci_restore_msi_state(dev);
         retval = pci_enable_device(dev);
         if (retval)
                 return retval;
@@ -149,7 +90,8 @@ static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state)
 {
         int ret = pcie_port_device_suspend(dev, state);
 
-        pcie_portdrv_save_config(dev);
+        if (!ret)
+                ret = pcie_portdrv_save_config(dev);
         return ret;
 }