瀏覽代碼

[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>
Jeff Garzik 17 年之前
父節點
當前提交
5dc0742b41
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      arch/sparc/kernel/time.c
  2. 1 1
      include/asm-sparc/floppy.h

+ 1 - 1
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;

+ 1 - 1
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)
 {