]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
e1000e: Remove unreachable code
authorBenjamin Poirier <bpoirier@suse.com>
Mon, 9 Nov 2015 23:50:18 +0000 (15:50 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 15 Dec 2015 03:30:21 +0000 (19:30 -0800)
msi-x interrupts are not shared so there's no need to check if the
interrupt was really from this adapter.

Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000e/netdev.c

index 955c8c76c680ccaf2333c3c5d798bd5c8e36b0fa..26cf1833b86db84d813a3f2bd80283aecfbda674 100644 (file)
@@ -1907,12 +1907,6 @@ static irqreturn_t e1000_msix_other(int __always_unused irq, void *data)
        struct e1000_hw *hw = &adapter->hw;
        u32 icr = er32(ICR);
 
-       if (!(icr & E1000_ICR_INT_ASSERTED)) {
-               if (!test_bit(__E1000_DOWN, &adapter->state))
-                       ew32(IMS, E1000_IMS_OTHER);
-               return IRQ_NONE;
-       }
-
        if (icr & adapter->eiac_mask)
                ew32(ICS, (icr & adapter->eiac_mask));