diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-31 05:08:48 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-20 18:43:05 -0400 |
| commit | 5dc0742b41066e1e141f2b4b00557e563a83fccc (patch) | |
| tree | 2e727ef5dba11bca025c08431cf6e8c7b9230cbc | |
| parent | 90968eb5a415a0fe6ffb617af35b3a5321bd4497 (diff) | |
[SPARC] minor irq handler cleanups
- mark timer_interrupt() static
- sparc_floppy_request_irq() prototype should use irq_handler_t
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Acked-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/kernel/time.c | 2 | ||||
| -rw-r--r-- | include/asm-sparc/floppy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index cfaf22c05bc..53caacbb398 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c @@ -105,7 +105,7 @@ __volatile__ unsigned int *master_l10_limit; #define TICK_SIZE (tick_nsec / 1000) -irqreturn_t timer_interrupt(int irq, void *dev_id) +static irqreturn_t timer_interrupt(int dummy, void *dev_id) { /* last time the cmos clock got updated */ static long last_rtc_update; diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h index dbe7a586be5..d3978e068e2 100644 --- a/include/asm-sparc/floppy.h +++ b/include/asm-sparc/floppy.h @@ -280,7 +280,7 @@ static inline void sun_fd_enable_dma(void) /* Our low-level entry point in arch/sparc/kernel/entry.S */ extern int sparc_floppy_request_irq(int irq, unsigned long flags, - irqreturn_t (*irq_handler)(int irq, void *)); + irq_handler_t irq_handler); static int sun_fd_request_irq(void) { |