[PATCH v2 1/4] e1000e: Remove unreachable code

Path	csiph.com!news.mixmin.net!news.albasani.net!tahina.priv.at!bofh.it!news.nic.it!robomod
From	Benjamin Poirier <bpoirier@suse.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 1/4] e1000e: Remove unreachable code
Date	Fri, 30 Oct 2015 18:40:02 +0100
Message-ID	<qplOG-eO-11@gated-at.bofh.it> (permalink)
References	<qplOG-eO-5@gated-at.bofh.it>
X-Original-To	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
X-Mailer	git-send-email 2.6.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	33
Organization	linux.* mail to news gateway
X-Original-Cc	Alexander Duyck <alexander.duyck@gmail.com>, Frank Steiner <steiner-reg@bio.ifi.lmu.de>, Jesse Brandeburg <jesse.brandeburg@intel.com>, Shannon Nelson <shannon.nelson@intel.com>, Carolyn Wyborny <carolyn.wyborny@intel.com>, Don Skidmore <donald.c.skidmore@intel.com>, Matthew Vick <matthew.vick@intel.com>, John Ronciak <john.ronciak@intel.com>, Mitch Williams <mitch.a.williams@intel.com>, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Fri, 30 Oct 2015 10:31:01 -0700
X-Original-Message-ID	<1446226264-29660-2-git-send-email-bpoirier@suse.com>
X-Original-References	<1446226264-29660-1-git-send-email-bpoirier@suse.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1259659

Show key headers only | View raw

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>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 0a854a4..a228167 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -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));
 
-- 
2.6.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v2 1/4] e1000e: Remove unreachable code Benjamin Poirier <bpoirier@suse.com> - 2015-10-30 18:40 +0100

csiph-web