]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
igb: Drop unnecessary write of E1000_IMS from igb_msix_other
authorAlexander Duyck <alexander.h.duyck@intel.com>
Fri, 26 Aug 2011 07:47:01 +0000 (07:47 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 12:58:34 +0000 (20:58 +0800)
Since we mask interrupts in EIMS not in IMS there is no need to re-enable
mask bits in that register.  As such we can remove the write to IMS from
the end of igb_msix_other.

(cherry picked from commit 9ab64ba3c74540cfb8716232834df486bcc6120d)
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/igb/igb_main.c

index 98a0ec6535ad19cbefcd5d6e04467d5d9e15289b..a908133b663e895fa1465321b72a5da46c6d98ae 100644 (file)
@@ -4767,12 +4767,6 @@ static irqreturn_t igb_msix_other(int irq, void *data)
                        mod_timer(&adapter->watchdog_timer, jiffies + 1);
        }
 
-       if (adapter->vfs_allocated_count)
-               wr32(E1000_IMS, E1000_IMS_LSC |
-                               E1000_IMS_VMMB |
-                               E1000_IMS_DOUTSYNC);
-       else
-               wr32(E1000_IMS, E1000_IMS_LSC | E1000_IMS_DOUTSYNC);
        wr32(E1000_EIMS, adapter->eims_other);
 
        return IRQ_HANDLED;