[PATCH][v850] Use irqreturn_t on v850 rte-me2-cb platform

From: Miles Bader
Date: Fri Oct 10 2003 - 04:24:12 EST


Linus, please apply.

The cb_pic_handle_irq function on this platform hadn't been updated to
use irqreturn_t; do so.

diff -ruN -X../cludes linux-2.6.0-test7-moo/arch/v850/kernel/rte_me2_cb.c linux-2.6.0-test7-moo-v850-20031010/arch/v850/kernel/rte_me2_cb.c
--- linux-2.6.0-test7-moo/arch/v850/kernel/rte_me2_cb.c 2003-07-28 10:13:58.000000000 +0900
+++ linux-2.6.0-test7-moo-v850-20031010/arch/v850/kernel/rte_me2_cb.c 2003-10-10 18:01:48.000000000 +0900
@@ -230,8 +217,10 @@
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;

@@ -257,13 +246,16 @@

/* 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)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/