On Tue, 21 Feb 2012 10:03:26 +0530, Thomas Abraham <thomas.abra...@linaro.org> wrote: > Add device tree based instantiation of the interrupt combiner controller. > > Cc: Grant Likely <grant.lik...@secretlab.ca> > Cc: Rob Herring <rob.herr...@calxeda.com> > Signed-off-by: Thomas Abraham <thomas.abra...@linaro.org> > --- > @@ -406,13 +432,33 @@ void __init combiner_init(void __iomem *combiner_base, > struct device_node *np) > > for (i = 0; i < MAX_COMBINER_NR; i++) { > combiner_init_one(i, combiner_base + (i >> 2) * 0x10); > - combiner_cascade_irq(i, IRQ_SPI(i)); > +#ifdef CONFIG_OF > + irq = np ? irq_of_parse_and_map(np, i) : IRQ_SPI(i); > +#else > + irq = IRQ_SPI(i); > +#endif
Hmmm, the #ifdef is rather ugly. I'd rather have an empty irq_of_parse_and_map() that always returns 0. The patch series is fine, and you can add my acked-by, but please send a follow-up patch to clean it up. Acked-by: Grant Likely <grant.lik...@secretlab.ca> -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html