aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-10-09 07:19:47 -0400
committerDavid Howells <dhowells@redhat.com>2006-10-09 07:19:47 -0400
commit40220c1a192f51695f806d75b1f9970f0f17a6e8 (patch)
tree86623a8c361420c22c6511b20770057fd9c9881d /arch/m68k/kernel
parent58ba81dba77eab43633ea47d82e96245ae3ff666 (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/m68k/kernel')
-rw-r--r--arch/m68k/kernel/ints.c2
-rw-r--r--arch/m68k/kernel/setup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 6fa893fc5fd6..849c9488c7f8 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -216,7 +216,7 @@ int setup_irq(unsigned int irq, struct irq_node *node)
216} 216}
217 217
218int request_irq(unsigned int irq, 218int request_irq(unsigned int irq,
219 irqreturn_t (*handler) (int, void *), 219 irq_handler_t handler,
220 unsigned long flags, const char *devname, void *dev_id) 220 unsigned long flags, const char *devname, void *dev_id)
221{ 221{
222 struct irq_node *node; 222 struct irq_node *node;
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index 869c4861346e..42d5b85f3350 100644
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -64,7 +64,7 @@ static char m68k_command_line[CL_SIZE];
64 64
65char m68k_debug_device[6] = ""; 65char m68k_debug_device[6] = "";
66 66
67void (*mach_sched_init) (irqreturn_t (*handler)(int, void *)) __initdata = NULL; 67void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL;
68/* machine dependent irq functions */ 68/* machine dependent irq functions */
69void (*mach_init_IRQ) (void) __initdata = NULL; 69void (*mach_init_IRQ) (void) __initdata = NULL;
70void (*mach_get_model) (char *model); 70void (*mach_get_model) (char *model);