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/irda/via-ircc.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/irda/via-ircc.c')
-rw-r--r-- | drivers/net/irda/via-ircc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 126ec7c8680e..58e128784585 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -1346,19 +1346,13 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase) | |||
1346 | * An interrupt from the chip has arrived. Time to do some work | 1346 | * An interrupt from the chip has arrived. Time to do some work |
1347 | * | 1347 | * |
1348 | */ | 1348 | */ |
1349 | static irqreturn_t via_ircc_interrupt(int irq, void *dev_id) | 1349 | static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id) |
1350 | { | 1350 | { |
1351 | struct net_device *dev = (struct net_device *) dev_id; | 1351 | struct net_device *dev = dev_id; |
1352 | struct via_ircc_cb *self; | 1352 | struct via_ircc_cb *self = dev->priv; |
1353 | int iobase; | 1353 | int iobase; |
1354 | u8 iHostIntType, iRxIntType, iTxIntType; | 1354 | u8 iHostIntType, iRxIntType, iTxIntType; |
1355 | 1355 | ||
1356 | if (!dev) { | ||
1357 | IRDA_WARNING("%s: irq %d for unknown device.\n", driver_name, | ||
1358 | irq); | ||
1359 | return IRQ_NONE; | ||
1360 | } | ||
1361 | self = (struct via_ircc_cb *) dev->priv; | ||
1362 | iobase = self->io.fir_base; | 1356 | iobase = self->io.fir_base; |
1363 | spin_lock(&self->lock); | 1357 | spin_lock(&self->lock); |
1364 | iHostIntType = GetHostStatus(iobase); | 1358 | iHostIntType = GetHostStatus(iobase); |