diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-29 05:46:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:03:40 -0500 |
commit | 28fc1f5a0c375cb6375fa48e9a8b393f2a189be6 (patch) | |
tree | 95b3b517b02dd46ff0fc2728c1e70de8d6f78ed3 /drivers/net/declance.c | |
parent | 1b36efe07f83ecf50eddd431d067c7bf86318e87 (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/declance.c')
-rw-r--r-- | drivers/net/declance.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 00e0194bfef0..6b1e77cc069e 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -719,15 +719,15 @@ out: | |||
719 | spin_unlock(&lp->lock); | 719 | spin_unlock(&lp->lock); |
720 | } | 720 | } |
721 | 721 | ||
722 | static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id) | 722 | static irqreturn_t lance_dma_merr_int(int irq, void *dev_id) |
723 | { | 723 | { |
724 | struct net_device *dev = dev_id; | 724 | struct net_device *dev = dev_id; |
725 | 725 | ||
726 | printk("%s: DMA error\n", dev->name); | 726 | printk(KERN_ERR "%s: DMA error\n", dev->name); |
727 | return IRQ_HANDLED; | 727 | return IRQ_HANDLED; |
728 | } | 728 | } |
729 | 729 | ||
730 | static irqreturn_t lance_interrupt(const int irq, void *dev_id) | 730 | static irqreturn_t lance_interrupt(int irq, void *dev_id) |
731 | { | 731 | { |
732 | struct net_device *dev = dev_id; | 732 | struct net_device *dev = dev_id; |
733 | struct lance_private *lp = netdev_priv(dev); | 733 | struct lance_private *lp = netdev_priv(dev); |