From 689d2617ea70231a79c883f2e0a07641925cdb0f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 21 Oct 2003 18:24:09 -0700 Subject: [PATCH] [PATCH] v850: Use irqreturn_t on rte-me2-cb platform From: miles@lsi.nec.co.jp (Miles Bader) The cb_pic_handle_irq function on this platform hadn't been updated to use irqreturn_t; do so. --- arch/v850/kernel/rte_me2_cb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/v850/kernel/rte_me2_cb.c b/arch/v850/kernel/rte_me2_cb.c index 60c07c0a63f0..faaf3d95e6cf 100644 --- a/arch/v850/kernel/rte_me2_cb.c +++ b/arch/v850/kernel/rte_me2_cb.c @@ -217,8 +217,10 @@ void cb_pic_shutdown_irq (unsigned irq) CB_PIC_INT1M &= ~(1 << (irq - CB_PIC_BASE_IRQ)); } -static void cb_pic_handle_irq (int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t cb_pic_handle_irq (int irq, void *dev_id, + struct pt_regs *regs) { + irqreturn_t rval = IRQ_NONE; unsigned status = CB_PIC_INTR; unsigned enable = CB_PIC_INT1M; @@ -244,13 +246,16 @@ static void cb_pic_handle_irq (int irq, void *dev_id, struct pt_regs *regs) /* Recursively call handle_irq to handle it. */ handle_irq (irq, regs); + rval = IRQ_HANDLED; } while (status); } CB_PIC_INTEN |= CB_PIC_INT1EN; -} + return rval; +} + static void irq_nop (unsigned irq) { } static unsigned cb_pic_startup_irq (unsigned irq) -- 2.39.5