diff options
| author | David Howells <dhowells@redhat.com> | 2006-10-09 12:19:47 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2006-10-09 12:19:47 +0100 |
| commit | 40220c1a192f51695f806d75b1f9970f0f17a6e8 (patch) | |
| tree | 86623a8c361420c22c6511b20770057fd9c9881d /arch/m68k/hp300 | |
| parent | 58ba81dba77eab43633ea47d82e96245ae3ff666 (diff) | |
| download | lwn-40220c1a192f51695f806d75b1f9970f0f17a6e8.tar.gz lwn-40220c1a192f51695f806d75b1f9970f0f17a6e8.zip | |
IRQ: Use the new typedef for interrupt handler function pointers
Use the new typedef for interrupt handler function pointers rather than
actually spelling out the full thing each time. This was scripted with the
following small shell script:
#!/bin/sh
egrep -nHrl -e 'irqreturn_t[ ]*[(][*]' $* |
while read i
do
echo $i
perl -pi -e 's/irqreturn_t\s*[(]\s*[*]\s*([_a-zA-Z0-9]*)\s*[)]\s*[(]\s*int\s*,\s*void\s*[*]\s*[)]/irq_handler_t \1/g' $i || exit $?
done
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/m68k/hp300')
| -rw-r--r-- | arch/m68k/hp300/time.c | 4 | ||||
| -rw-r--r-- | arch/m68k/hp300/time.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c index 086058fd8383..dd7c8a2583d3 100644 --- a/arch/m68k/hp300/time.c +++ b/arch/m68k/hp300/time.c @@ -39,7 +39,7 @@ static irqreturn_t hp300_tick(int irq, void *dev_id) { unsigned long tmp; - irqreturn_t (*vector)(int, void *) = dev_id; + irq_handler_t vector = dev_id; in_8(CLOCKBASE + CLKSR); asm volatile ("movpw %1@(5),%0" : "=d" (tmp) : "a" (CLOCKBASE)); /* Turn off the network and SCSI leds */ @@ -63,7 +63,7 @@ unsigned long hp300_gettimeoffset(void) return (USECS_PER_JIFFY * ticks) / INTVAL; } -void __init hp300_sched_init(irqreturn_t (*vector)(int, void *)) +void __init hp300_sched_init(irq_handler_t vector) { out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */ out_8(CLOCKBASE + CLKCR1, 0x1); /* reset */ diff --git a/arch/m68k/hp300/time.h b/arch/m68k/hp300/time.h index ca66a039d6f2..f5b3d098b0f5 100644 --- a/arch/m68k/hp300/time.h +++ b/arch/m68k/hp300/time.h @@ -1,4 +1,4 @@ -extern void hp300_sched_init(irqreturn_t (*vector)(int, void *)); +extern void hp300_sched_init(irq_handler_t vector); extern unsigned long hp300_gettimeoffset (void); |