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/um | |
| 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/um')
| -rw-r--r-- | arch/um/include/irq_kern.h | 4 | ||||
| -rw-r--r-- | arch/um/kernel/irq.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/include/irq_kern.h b/arch/um/include/irq_kern.h index 81beb1841299..4f775597fd5f 100644 --- a/arch/um/include/irq_kern.h +++ b/arch/um/include/irq_kern.h @@ -10,11 +10,11 @@ #include "asm/ptrace.h" extern int um_request_irq(unsigned int irq, int fd, int type, - irqreturn_t (*handler)(int, void *), + irq_handler_t handler, unsigned long irqflags, const char * devname, void *dev_id); extern int init_aio_irq(int irq, char *name, - irqreturn_t (*handler)(int, void *)); + irq_handler_t handler); #endif diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 3c01c2bc979a..ef259569fd8c 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c @@ -364,7 +364,7 @@ unsigned int do_IRQ(int irq, union uml_pt_regs *regs) } int um_request_irq(unsigned int irq, int fd, int type, - irqreturn_t (*handler)(int, void *), + irq_handler_t handler, unsigned long irqflags, const char * devname, void *dev_id) { @@ -425,7 +425,7 @@ void __init init_IRQ(void) } } -int init_aio_irq(int irq, char *name, irqreturn_t (*handler)(int, void *)) +int init_aio_irq(int irq, char *name, irq_handler_t handler) { int fds[2], err; |