]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: Remove unreachable code
authorBenjamin Poirier <bpoirier@suse.com>
Mon, 9 Nov 2015 23:50:18 +0000 (15:50 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 22 Jun 2017 06:24:39 +0000 (23:24 -0700)
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>
Orabug: 26243014
(cherry picked from commit 4d432f67ff004dc387ba307d418d0eae4fa9dc13)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Ethan Zhao <ethan.zhao@oracle.com>
drivers/net/ethernet/intel/e1000e/netdev.c

index 42182cb75f98f07068938bed3d57703bcb10b395..732c2310f8657ded3b16bd3bc21c0cb62305cda7 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));