Messages in this thread | | | Date | Thu, 28 Mar 2013 17:52:48 -0500 | From | Rob Herring <> | Subject | Re: [PATCH 1/2] ARM: irq: Call irqchit_init if no init_irq function is specified |
| |
On 03/28/2013 03:46 PM, Maxime Ripard wrote: > More and more sub-architectures are using only the irqchip_init > function. Make the core code call this function if no init_irq field is > provided in the machine description to remove some boilerplate code. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
> --- > arch/arm/kernel/irq.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c > index 8e4ef4c..9723d17 100644 > --- a/arch/arm/kernel/irq.c > +++ b/arch/arm/kernel/irq.c > @@ -26,6 +26,7 @@ > #include <linux/ioport.h> > #include <linux/interrupt.h> > #include <linux/irq.h> > +#include <linux/irqchip.h> > #include <linux/random.h> > #include <linux/smp.h> > #include <linux/init.h> > @@ -114,7 +115,10 @@ EXPORT_SYMBOL_GPL(set_irq_flags); > > void __init init_IRQ(void) > { > - machine_desc->init_irq(); > + if (IS_ENABLED(CONFIG_OF) && !machine_desc->init_irq) > + irqchip_init(); > + else > + machine_desc->init_irq(); > } > > #ifdef CONFIG_MULTI_IRQ_HANDLER >
| |