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/mips/au1000 | |
| parent | 58ba81dba77eab43633ea47d82e96245ae3ff666 (diff) | |
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/mips/au1000')
| -rw-r--r-- | arch/mips/au1000/common/dma.c | 2 | ||||
| -rw-r--r-- | arch/mips/au1000/common/irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/au1000/common/time.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c index c3019b9c91b..c78260d4e83 100644 --- a/arch/mips/au1000/common/dma.c +++ b/arch/mips/au1000/common/dma.c @@ -160,7 +160,7 @@ void dump_au1000_dma_channel(unsigned int dmanr) * Requests the DMA done IRQ if irqhandler != NULL. */ int request_au1000_dma(int dev_id, const char *dev_str, - irqreturn_t (*irqhandler)(int, void *), + irq_handler_t irqhandler, unsigned long irqflags, void *irq_dev_id) { diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index b32597e05a6..2abe132bb07 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c @@ -288,7 +288,7 @@ static struct irq_chip level_irq_type = { }; #ifdef CONFIG_PM -void startup_match20_interrupt(irqreturn_t (*handler)(int, void *)) +void startup_match20_interrupt(irq_handler_t handler) { struct irq_desc *desc = &irq_desc[AU1000_TOY_MATCH2_INT]; diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index dd9c364b474..94f09194d63 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c @@ -61,7 +61,7 @@ static unsigned int timerhi = 0, timerlo = 0; #error "unsupported HZ value! Must be in [100,1000]" #endif #define MATCH20_INC (328*100/HZ) /* magic number 328 is for HZ=100... */ -extern void startup_match20_interrupt(irqreturn_t (*handler)(int, void *)); +extern void startup_match20_interrupt(irq_handler_t handler); static unsigned long last_pc0, last_match20; #endif |