Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NETDRVR] lib82596, netxen: delete pointless tests from irq handler

Browse Source 
Remove always-false tests in irq handler.

Also a few other minor cleanups.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Jeff Garzik 2007-10-19 03:14:03 -04:00
parent 06efcad0d4
commit 1daec86ad1
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/lib82596.c
View File

@ -1124,12 +1124,6 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id)
struct i596_dma *dma; struct i596_dma *dma;
unsigned short status, ack_cmd = 0; unsigned short status, ack_cmd = 0;
if (dev == NULL) {
printk(KERN_WARNING "%s: irq %d for unknown device.\n",
__FUNCTION__, irq);
return IRQ_NONE;
}
lp = netdev_priv(dev); lp = netdev_priv(dev);
dma = lp->dma; dma = lp->dma;
@ -1140,7 +1134,7 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id)
DEB(DEB_INTS, printk(KERN_DEBUG DEB(DEB_INTS, printk(KERN_DEBUG
"%s: i596 interrupt, IRQ %d, status %4.4x.\n", "%s: i596 interrupt, IRQ %d, status %4.4x.\n",
dev->name, irq, status)); dev->name, dev->irq, status));
ack_cmd = status & 0xf000; ack_cmd = status & 0xf000;

11
drivers/net/netxen/netxen_nic_main.c
View File

@ -1268,17 +1268,10 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
*/ */
irqreturn_t netxen_intr(int irq, void *data) irqreturn_t netxen_intr(int irq, void *data)
{ {
struct netxen_adapter *adapter; struct netxen_adapter *adapter = data;
struct net_device *netdev; struct net_device *netdev = adapter->netdev;
u32 our_int = 0; u32 our_int = 0;
if (unlikely(!irq)) {
return IRQ_NONE; /* Not our interrupt */
}
adapter = (struct netxen_adapter *)data;
netdev = adapter->netdev;
if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR)); our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
/* not our interrupt */ /* not our interrupt */