Merge branches 'irq/sparseirq' and 'linus' into irq/core

1 files changed, 2 insertions, 24 deletions

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index a50db5398fa5..9dd13ad12ce4 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1023,11 +1023,10 @@ static int __devinit igb_probe(struct pci_dev *pdev,
         struct net_device *netdev;
         struct igb_adapter *adapter;
         struct e1000_hw *hw;
-        struct pci_dev *us_dev;
         const struct e1000_info *ei = igb_info_tbl[ent->driver_data];
         unsigned long mmio_start, mmio_len;
-        int i, err, pci_using_dac, pos;
-        u16 eeprom_data = 0, state = 0;
+        int i, err, pci_using_dac;
+        u16 eeprom_data = 0;
         u16 eeprom_apme_mask = IGB_EEPROM_APME;
         u32 part_num;
         int bars, need_ioport;
@@ -1062,27 +1061,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 }
         }
 
-        /* 82575 requires that the pci-e link partner disable the L0s state */
-        switch (pdev->device) {
-        case E1000_DEV_ID_82575EB_COPPER:
-        case E1000_DEV_ID_82575EB_FIBER_SERDES:
-        case E1000_DEV_ID_82575GB_QUAD_COPPER:
-                us_dev = pdev->bus->self;
-                pos = pci_find_capability(us_dev, PCI_CAP_ID_EXP);
-                if (pos) {
-                        pci_read_config_word(us_dev, pos + PCI_EXP_LNKCTL,
-                                             &state);
-                        state &= ~PCIE_LINK_STATE_L0S;
-                        pci_write_config_word(us_dev, pos + PCI_EXP_LNKCTL,
-                                              state);
-                        dev_info(&pdev->dev,
-                                 "Disabling ASPM L0s upstream switch port %s\n",
-                                 pci_name(us_dev));
-                }
-        default:
-                break;
-        }
-
         err = pci_request_selected_regions(pdev, bars, igb_driver_name);
         if (err)
                 goto err_pci_reg;