[SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate

[linux-2.6-block.git] / arch / sparc / kernel / irq.c

diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index 722d67d32961eb570bc762faf49dbc3dae856811..e1e24f31aa5463c7a55e2d30ac77a3e1900d12a5 100644 (file)
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -479,7 +479,7 @@ EXPORT_SYMBOL(pdma_areasize);
 
 extern void floppy_hardint(void);
 
-static irqreturn_t (*floppy_irq_handler)(int irq, void *dev_id);
+static irq_handler_t floppy_irq_handler;
 
 void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
@@ -500,7 +500,7 @@ void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 int sparc_floppy_request_irq(int irq, unsigned long flags,
-                            irqreturn_t (*irq_handler)(int irq, void *))
+                            irq_handler_t irq_handler)
 {
        floppy_irq_handler = irq_handler;
        return request_fast_irq(irq, floppy_hardint, flags, "floppy");