tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Remove always-false tests in irq handler.

Also a few other minor cleanups.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

Jeff Garzik 1daec86a 06efcad0

+3 -16
unified split
+1 -7
drivers/net/lib82596.c
··· 1124 struct i596_dma *dma; 1125 unsigned short status, ack_cmd = 0; 1126 1127 - if (dev == NULL) { 1128 - printk(KERN_WARNING "%s: irq %d for unknown device.\n", 1129 - __FUNCTION__, irq); 1130 - return IRQ_NONE; 1131 - } 1132 - 1133 lp = netdev_priv(dev); 1134 dma = lp->dma; 1135 ··· 1134 1135 DEB(DEB_INTS, printk(KERN_DEBUG 1136 "%s: i596 interrupt, IRQ %d, status %4.4x.\n", 1137 - dev->name, irq, status)); 1138 1139 ack_cmd = status & 0xf000; 1140
··· 1124 struct i596_dma *dma; 1125 unsigned short status, ack_cmd = 0; 1126 1127 lp = netdev_priv(dev); 1128 dma = lp->dma; 1129 ··· 1140 1141 DEB(DEB_INTS, printk(KERN_DEBUG 1142 "%s: i596 interrupt, IRQ %d, status %4.4x.\n", 1143 + dev->name, dev->irq, status)); 1144 1145 ack_cmd = status & 0xf000; 1146
+2 -9
drivers/net/netxen/netxen_nic_main.c
··· 1268 */ 1269 irqreturn_t netxen_intr(int irq, void *data) 1270 { 1271 - struct netxen_adapter *adapter; 1272 - struct net_device *netdev; 1273 u32 our_int = 0; 1274 - 1275 - if (unlikely(!irq)) { 1276 - return IRQ_NONE; /* Not our interrupt */ 1277 - } 1278 - 1279 - adapter = (struct netxen_adapter *)data; 1280 - netdev = adapter->netdev; 1281 1282 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { 1283 our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
··· 1268 */ 1269 irqreturn_t netxen_intr(int irq, void *data) 1270 { 1271 + struct netxen_adapter *adapter = data; 1272 + struct net_device *netdev = adapter->netdev; 1273 u32 our_int = 0; 1274 1275 if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) { 1276 our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));