diff options
author | David Howells <dhowells@redhat.com> | 2006-10-09 07:19:47 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2006-10-09 07:19:47 -0400 |
commit | 40220c1a192f51695f806d75b1f9970f0f17a6e8 (patch) | |
tree | 86623a8c361420c22c6511b20770057fd9c9881d /include/asm-m68k | |
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 'include/asm-m68k')
-rw-r--r-- | include/asm-m68k/atari_stdma.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/ide.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/machdep.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-m68k/atari_stdma.h b/include/asm-m68k/atari_stdma.h index a6986af7915e..8e389b7fa70c 100644 --- a/include/asm-m68k/atari_stdma.h +++ b/include/asm-m68k/atari_stdma.h | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | /***************************** Prototypes *****************************/ | 9 | /***************************** Prototypes *****************************/ |
10 | 10 | ||
11 | void stdma_lock(irqreturn_t (*handler)(int, void *), void *data); | 11 | void stdma_lock(irq_handler_t handler, void *data); |
12 | void stdma_release( void ); | 12 | void stdma_release( void ); |
13 | int stdma_others_waiting( void ); | 13 | int stdma_others_waiting( void ); |
14 | int stdma_islocked( void ); | 14 | int stdma_islocked( void ); |
diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h index 896683a7a1f3..f9ffb2cbbae8 100644 --- a/include/asm-m68k/ide.h +++ b/include/asm-m68k/ide.h | |||
@@ -123,7 +123,7 @@ static __inline__ void ide_release_lock (void) | |||
123 | } | 123 | } |
124 | 124 | ||
125 | static __inline__ void | 125 | static __inline__ void |
126 | ide_get_lock(irqreturn_t (*handler)(int, void *), void *data) | 126 | ide_get_lock(irq_handler_t handler, void *data) |
127 | { | 127 | { |
128 | if (MACH_IS_ATARI) { | 128 | if (MACH_IS_ATARI) { |
129 | if (falconide_intr_lock == 0) { | 129 | if (falconide_intr_lock == 0) { |
diff --git a/include/asm-m68k/machdep.h b/include/asm-m68k/machdep.h index 862afa4c35d8..26d2b91209c5 100644 --- a/include/asm-m68k/machdep.h +++ b/include/asm-m68k/machdep.h | |||
@@ -10,7 +10,7 @@ struct rtc_time; | |||
10 | struct rtc_pll_info; | 10 | struct rtc_pll_info; |
11 | struct buffer_head; | 11 | struct buffer_head; |
12 | 12 | ||
13 | extern void (*mach_sched_init) (irqreturn_t (*handler)(int, void *)); | 13 | extern void (*mach_sched_init) (irq_handler_t handler); |
14 | /* machine dependent irq functions */ | 14 | /* machine dependent irq functions */ |
15 | extern void (*mach_init_IRQ) (void); | 15 | extern void (*mach_init_IRQ) (void); |
16 | extern void (*mach_get_model) (char *model); | 16 | extern void (*mach_get_model) (char *model); |