diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/irq.c | 4 | ||||
-rw-r--r-- | arch/x86/xen/events.c | 4 |
2 files changed, 4 insertions, 4 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); | |||
479 | 479 | ||
480 | extern void floppy_hardint(void); | 480 | extern void floppy_hardint(void); |
481 | 481 | ||
482 | static irqreturn_t (*floppy_irq_handler)(int irq, void *dev_id); | 482 | static irq_handler_t floppy_irq_handler; |
483 | 483 | ||
484 | void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs) | 484 | void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs) |
485 | { | 485 | { |
@@ -500,7 +500,7 @@ void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs) | |||
500 | } | 500 | } |
501 | 501 | ||
502 | int sparc_floppy_request_irq(int irq, unsigned long flags, | 502 | int sparc_floppy_request_irq(int irq, unsigned long flags, |
503 | irqreturn_t (*irq_handler)(int irq, void *)) | 503 | irq_handler_t irq_handler) |
504 | { | 504 | { |
505 | floppy_irq_handler = irq_handler; | 505 | floppy_irq_handler = irq_handler; |
506 | return request_fast_irq(irq, floppy_hardint, flags, "floppy"); | 506 | return request_fast_irq(irq, floppy_hardint, flags, "floppy"); |
diff --git a/arch/x86/xen/events.c b/arch/x86/xen/events.c index da1b173547a1..6d1da5809e6f 100644 --- a/arch/x86/xen/events.c +++ b/arch/x86/xen/events.c | |||
@@ -383,7 +383,7 @@ static void unbind_from_irq(unsigned int irq) | |||
383 | } | 383 | } |
384 | 384 | ||
385 | int bind_evtchn_to_irqhandler(unsigned int evtchn, | 385 | int bind_evtchn_to_irqhandler(unsigned int evtchn, |
386 | irqreturn_t (*handler)(int, void *), | 386 | irq_handler_t handler, |
387 | unsigned long irqflags, | 387 | unsigned long irqflags, |
388 | const char *devname, void *dev_id) | 388 | const char *devname, void *dev_id) |
389 | { | 389 | { |
@@ -402,7 +402,7 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn, | |||
402 | EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler); | 402 | EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler); |
403 | 403 | ||
404 | int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, | 404 | int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, |
405 | irqreturn_t (*handler)(int, void *), | 405 | irq_handler_t handler, |
406 | unsigned long irqflags, const char *devname, void *dev_id) | 406 | unsigned long irqflags, const char *devname, void *dev_id) |
407 | { | 407 | { |
408 | unsigned int irq; | 408 | unsigned int irq; |