diff options
| author | Guillem Jover <guillem@hadrons.org> | 2009-12-17 14:39:25 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2009-12-18 11:56:45 +0100 |
| commit | 0ae79e6cd9d4ab5d70ae399850bb804991b92c94 (patch) | |
| tree | 92289e7c3c7f662029a29c87c326c92ab9435bef /linux/dev/arch/i386/kernel/irq.c | |
| parent | 2cd448b2a65df4d81950f9d5bd2389add9d1b8da (diff) | |
Interrupt handlers do not return any value
* i386/i386at/kd_mouse.c (kd_mouse_open): Change kdintr return type
to `void'.
(oldvect): Change return type to `void'.
* linux/dev/arch/i386/kernel/irq.c (linux_timer_intr): Likewise.
(intnull, prtnull, linux_intr, linux_bad_intr): Likewise.
(old_clock_handler): Likewise.
Diffstat (limited to 'linux/dev/arch/i386/kernel/irq.c')
| -rw-r--r-- | linux/dev/arch/i386/kernel/irq.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c index 4bed353d..8966dea1 100644 --- a/linux/dev/arch/i386/kernel/irq.c +++ b/linux/dev/arch/i386/kernel/irq.c @@ -47,7 +47,7 @@ #include <asm/io.h> #include <asm/hardirq.h> -extern int linux_timer_intr (void); +extern void linux_timer_intr (void); extern spl_t splhigh (void); extern spl_t spl0 (void); extern void form_pic_mask (void); @@ -99,13 +99,13 @@ extern spl_t curr_ipl; extern int curr_pic_mask; extern int pic_mask[]; -extern int intnull (), prtnull (); +extern void intnull (), prtnull (); /* * Generic interrupt handler for Linux devices. * Set up a fake `struct pt_regs' then call the real handler. */ -static int +static void linux_intr (int irq) { struct pt_regs regs; @@ -128,9 +128,6 @@ linux_intr (int irq) restore_flags (flags); intr_count--; - - /* Not used. by OKUJI Yoshinori. */ - return 0; } /* @@ -208,11 +205,10 @@ enable_irq (unsigned int irq_nr) /* * Default interrupt handler for Linux. */ -int +void linux_bad_intr (int irq) { mask_irq (irq); - return 0; } static int @@ -685,7 +681,7 @@ void __global_restore_flags(unsigned long flags) #endif -static int (*old_clock_handler) (); +static void (*old_clock_handler) (); static int old_clock_pri; void |