aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-29 05:46:16 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:03:40 -0500
commit28fc1f5a0c375cb6375fa48e9a8b393f2a189be6 (patch)
tree95b3b517b02dd46ff0fc2728c1e70de8d6f78ed3 /drivers/net/pcmcia
parent1b36efe07f83ecf50eddd431d067c7bf86318e87 (diff)
[netdrvr] irq handler minor cleanups in several drivers
* use irq_handler_t where appropriate * no need to use 'irq' function arg, its already stored in a data struct * rename irq handler 'irq' argument to 'dummy', where the function has been analyzed and proven not to use its first argument. * remove always-false "dev_id == NULL" test from irq handlers * remove pointless casts from void* * declance: irq argument is not const * add KERN_xxx printk prefix * fix minor whitespace weirdness Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 8c719b4df544..949c6df74c97 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -731,18 +731,13 @@ module_exit(exit_fmvj18x_cs);
731 731
732/*====================================================================*/ 732/*====================================================================*/
733 733
734static irqreturn_t fjn_interrupt(int irq, void *dev_id) 734static irqreturn_t fjn_interrupt(int dummy, void *dev_id)
735{ 735{
736 struct net_device *dev = dev_id; 736 struct net_device *dev = dev_id;
737 local_info_t *lp = netdev_priv(dev); 737 local_info_t *lp = netdev_priv(dev);
738 kio_addr_t ioaddr; 738 kio_addr_t ioaddr;
739 unsigned short tx_stat, rx_stat; 739 unsigned short tx_stat, rx_stat;
740 740
741 if (lp == NULL) {
742 printk(KERN_NOTICE "fjn_interrupt(): irq %d for "
743 "unknown device.\n", irq);
744 return IRQ_NONE;
745 }
746 ioaddr = dev->base_addr; 741 ioaddr = dev->base_addr;
747 742
748 /* avoid multiple interrupts */ 743 /* avoid multiple interrupts */