Home » Mailing list archives » linux-kernel » 2008 » April » 18

[PATCH 02/15] [SPARC] minor irq handler cleanups

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jeff Garzik
Subject: [PATCH 02/15] [SPARC] minor irq handler cleanups
Date: Friday, April 18, 2008 - 4:22 pm

- mark timer_interrupt() static

- sparc_floppy_request_irq() prototype should use irq_handler_t

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---
 arch/sparc/kernel/time.c   |    2 +-
 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 cfaf22c..53caacb 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 dbe7a58..d3978e0 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)
 {
-- 
1.5.4.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 02/15] [SPARC] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 03/15] [BLACKFIN] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 04/15] [PPC] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 05/15] drivers/char: minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 06/15] [SCSI] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 07/15] [SCSI] aha1542: minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 08/15] [ISDN] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 09/15] [AVR32] remove unused 'irq' argument from lo ..., Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 10/15] [IA64] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:22 pm)
[PATCH 11/15] [RTC] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 4:23 pm)
[PATCH 12/15] [MIPS] pmc-sierra/msp71xx/msp_hwbutton.c: mi ..., Jeff Garzik, (Fri Apr 18, 4:23 pm)
[PATCH 13/15] [X86] standard vm86 irq handler, Jeff Garzik, (Fri Apr 18, 4:23 pm)
[PATCH 14/15] Canonicalize several irq handlers., Jeff Garzik, (Fri Apr 18, 4:23 pm)
[PATCH 15/15] [INPUT, PCMCIA] avoid use of 'irq' function arg, Jeff Garzik, (Fri Apr 18, 4:23 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Lennert Buytenhek, (Fri Apr 18, 4:29 pm)
Re: [PATCH 02/15] [SPARC] minor irq handler cleanups, David Miller, (Fri Apr 18, 4:33 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Andrew Morton, (Fri Apr 18, 4:44 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 5:21 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 5:25 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Andrew Morton, (Fri Apr 18, 6:17 pm)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Rogier Wolff, (Fri Apr 18, 11:00 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Russell King, (Sat Apr 19, 1:17 am)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Sat Apr 19, 1:28 am)
Re: [PATCH 04/15] [PPC] minor irq handler cleanups, Kumar Gala, (Sat Apr 19, 7:57 am)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Lennert Buytenhek, (Sat Apr 19, 9:14 am)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Alan Cox, (Sat Apr 19, 9:16 am)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Sun Apr 20, 3:17 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Russell King, (Sun Apr 20, 3:40 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Sun Apr 20, 3:49 pm)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Jeff Garzik, (Sun Apr 20, 6:38 pm)
Re: [PATCH 13/15] [X86] standard vm86 irq handler, Ingo Molnar, (Mon Apr 21, 6:52 am)
Re: [PATCH 03/15] [BLACKFIN] minor irq handler cleanups, Bryan Wu, (Mon Apr 21, 8:27 pm)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Benjamin Herrenschmidt, (Tue Apr 22, 1:05 am)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Rogier Wolff, (Tue Apr 22, 3:13 am)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Benjamin Herrenschmidt, (Tue Apr 22, 3:46 am)
Re: [PATCH 12/15] [MIPS] pmc-sierra/msp71xx/msp_hwbutton.c ..., Ralf Baechle, (Mon Apr 28, 1:53 pm)