From 40220c1a192f51695f806d75b1f9970f0f17a6e8 Mon Sep 17 00:00:00 2001 From: David Howells Date: Mon, 9 Oct 2006 12:19:47 +0100 Subject: 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 --- arch/m68k/kernel/ints.c | 2 +- arch/m68k/kernel/setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/m68k/kernel') diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 6fa893fc5fd..849c9488c7f 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) } int request_irq(unsigned int irq, - irqreturn_t (*handler) (int, void *), + irq_handler_t handler, unsigned long flags, const char *devname, void *dev_id) { struct irq_node *node; diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 869c4861346..42d5b85f335 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c @@ -64,7 +64,7 @@ static char m68k_command_line[CL_SIZE]; char m68k_debug_device[6] = ""; -void (*mach_sched_init) (irqreturn_t (*handler)(int, void *)) __initdata = NULL; +void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL; /* machine dependent irq functions */ void (*mach_init_IRQ) (void) __initdata = NULL; void (*mach_get_model) (char *model); -- cgit v1.2.3