[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.

diff --git a/arch/v850/kernel/rte_me2_cb.c b/arch/v850/kernel/rte_me2_cb.c
index 60c07c0a63f078de23164f34542150653e24785b..faaf3d95e6cf3105b0c64c3bea14c19a3b44c44d 100644 (file)
--- 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;
+}
 
+\f
 static void irq_nop (unsigned irq) { }
 
 static unsigned cb_pic_startup_irq (unsigned irq)