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 /arch/ppc | |
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 'arch/ppc')
-rw-r--r-- | arch/ppc/8260_io/enet.c | 4 | ||||
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c index 615b6583d9b..06bb5b77ea6 100644 --- a/arch/ppc/8260_io/enet.c +++ b/arch/ppc/8260_io/enet.c | |||
@@ -272,7 +272,7 @@ scc_enet_timeout(struct net_device *dev) | |||
272 | * This is called from the CPM handler, not the MPC core interrupt. | 272 | * This is called from the CPM handler, not the MPC core interrupt. |
273 | */ | 273 | */ |
274 | static irqreturn_t | 274 | static irqreturn_t |
275 | scc_enet_interrupt(int irq, void * dev_id) | 275 | scc_enet_interrupt(int irq, void *dev_id) |
276 | { | 276 | { |
277 | struct net_device *dev = dev_id; | 277 | struct net_device *dev = dev_id; |
278 | volatile struct scc_enet_private *cep; | 278 | volatile struct scc_enet_private *cep; |
@@ -280,7 +280,7 @@ scc_enet_interrupt(int irq, void * dev_id) | |||
280 | ushort int_events; | 280 | ushort int_events; |
281 | int must_restart; | 281 | int must_restart; |
282 | 282 | ||
283 | cep = (struct scc_enet_private *)dev->priv; | 283 | cep = dev->priv; |
284 | 284 | ||
285 | /* Get the interrupt events that caused us to be here. | 285 | /* Get the interrupt events that caused us to be here. |
286 | */ | 286 | */ |
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index 6f3ed6a72e0..a3a27dafff1 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -524,7 +524,7 @@ fcc_enet_timeout(struct net_device *dev) | |||
524 | 524 | ||
525 | /* The interrupt handler. */ | 525 | /* The interrupt handler. */ |
526 | static irqreturn_t | 526 | static irqreturn_t |
527 | fcc_enet_interrupt(int irq, void * dev_id) | 527 | fcc_enet_interrupt(int irq, void *dev_id) |
528 | { | 528 | { |
529 | struct net_device *dev = dev_id; | 529 | struct net_device *dev = dev_id; |
530 | volatile struct fcc_enet_private *cep; | 530 | volatile struct fcc_enet_private *cep; |
@@ -532,7 +532,7 @@ fcc_enet_interrupt(int irq, void * dev_id) | |||
532 | ushort int_events; | 532 | ushort int_events; |
533 | int must_restart; | 533 | int must_restart; |
534 | 534 | ||
535 | cep = (struct fcc_enet_private *)dev->priv; | 535 | cep = dev->priv; |
536 | 536 | ||
537 | /* Get the interrupt events that caused us to be here. | 537 | /* Get the interrupt events that caused us to be here. |
538 | */ | 538 | */ |