From 4d2185d93c670902b6e4716b360e2bcb7d2f7b2f Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 17 Feb 2010 12:37:42 +0900 Subject: sh: Use dummy_irq_chip for INTC redirect vectors. Presently there's an ordering issue with the chained handler change which places the set_irq_chip() after set_irq_chained_handler(). This causes a warning to be emitted as the IRQ chip needs to be set first. However, there is the caveat that redirect IRQs can't use the parent IRQ's irq chip as they are just dummy redirects, resulting in intc_enable() blowing up when set_irq_chained_handler() attempts to start up the redirect IRQ. In these cases we can just use dummy_irq_chip directly, as we already extract the parent IRQ and chip from the redirect handler. Signed-off-by: Paul Mundt --- drivers/sh/intc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/sh/intc.c') diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c index 1da1ede..3a5a17d 100644 --- a/drivers/sh/intc.c +++ b/drivers/sh/intc.c @@ -899,8 +899,8 @@ void __init register_intc_controller(struct intc_desc *desc) vect2->enum_id = 0; /* redirect this interrupts to the first one */ + set_irq_chip(irq2, &dummy_irq_chip); set_irq_chained_handler(irq2, intc_redirect_irq); - set_irq_chip(irq2, &d->chip); set_irq_data(irq2, (void *)irq); } } -- cgit v1.1