[PATCH] of/irq: add empty irq_of_parse_and_map() for non-dt builds

[Grant Likely]

On Sat, 24 Mar 2012 08:12:39 -0500, Rob Herring <robherring2 at gmail.com> wrote:
> On 03/24/2012 04:27 AM, Thomas Abraham wrote:
> > Add a empty irq_of_parse_and_map() that returns 0 for non-dt builds and
> > avoid having #ifdef CONFIG_OF around all calls to irq_of_parse_and_map().
> > 
> > Suggested-by: Grant Likely <grant.likely at secretlab.ca>
> > Signed-off-by: Thomas Abraham <thomas.abraham at linaro.org>
> > ---
> 
> Acked-by: Rob Herring <rob.herring at calxeda.com>
> 
> Go ahead and merge with the rest of your series.

Actually, it's not quite fully baked; the forward declaration of
irq_of_parse_and_map() needs to be moved under the #if
defined(CONFIG_OF_IRQ) block (just move the #if statement up 7 lines).
After doing that you can add my acked-by and merge it with the rest of
your series.  There is no sense merging it through my tree when you
are the only user depending on it.

Acked-by: Grant Likely <grant.likely at secretlab.ca>

g.

> 
> Rob
> 
> >  include/linux/of_irq.h |    6 ++++++
> >  1 files changed, 6 insertions(+), 0 deletions(-)
> > 
> > diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
> > index d229ad3..5614355 100644
> > --- a/include/linux/of_irq.h
> > +++ b/include/linux/of_irq.h
> > @@ -76,5 +76,11 @@ extern struct device_node *of_irq_find_parent(struct device_node *child);
> >  extern void of_irq_init(const struct of_device_id *matches);
> >  
> >  #endif /* CONFIG_OF_IRQ */
> > +#else /* CONFIG_OF */
> > +static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
> > +						int index)
> > +{
> > +	return 0;
> > +}
> >  #endif /* CONFIG_OF */
> >  #endif /* __OF_IRQ_H */
> 
> _______________________________________________
> devicetree-discuss mailing list
> devicetree-discuss at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/devicetree-discuss

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.