aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-19 03:12:20 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-23 19:53:17 -0400
commit7c2399756ab8ccb2c57da4630b4aa4a1d61b3846 (patch)
treed201140b6c42c92a1f283707861e824935ea0e39 /arch/sparc
parentdrivers/char/riscom8: clean up irq handling (diff)
downloadlinux-dev-7c2399756ab8ccb2c57da4630b4aa4a1d61b3846.tar.xz
linux-dev-7c2399756ab8ccb2c57da4630b4aa4a1d61b3846.zip
[SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate
Rather than hand-rolling our own prototype, make the code more future-proof by using the standard irq_handler_t typedef. Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/kernel/irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index 722d67d32961..e1e24f31aa54 100644
--- 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");