| Message ID | 1448273816-11290-2-git-send-email-carlo@caione.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Nov 23, 2015 at 11:16 AM, Carlo Caione <carlo@caione.org> wrote: > From: Carlo Caione <carlo@endlessm.com> > > of_irq_find_parent was made static since it had no users outside of > of_irq.c. Export it again since we are going to use it again. > > Signed-off-by: Carlo Caione <carlo@endlessm.com> > --- > drivers/of/irq.c | 2 +- > include/linux/of_irq.h | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/irq.c b/drivers/of/irq.c > index 902b89b..45735d5 100644 > --- a/drivers/of/irq.c > +++ b/drivers/of/irq.c > @@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map); > * Returns a pointer to the interrupt parent node, or NULL if the interrupt > * parent could not be determined. > */ > -static struct device_node *of_irq_find_parent(struct device_node *child) > +struct device_node *of_irq_find_parent(struct device_node *child) If you're making this public you should also EXPORT_SYMBOL_GPL(of_irq_find_parent) I need an ACK from Rob if this should be merged through the GPIO tree. If it is going through the OF tree we'll have to defer the resto of the stuff to the next merge window or set it up on an immutable branch I can pull. Yours, Linus Walleij
diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 902b89b..45735d5 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map); * Returns a pointer to the interrupt parent node, or NULL if the interrupt * parent could not be determined. */ -static struct device_node *of_irq_find_parent(struct device_node *child) +struct device_node *of_irq_find_parent(struct device_node *child) { struct device_node *p; const __be32 *parp; diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 039f2ee..6f879c6 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -94,6 +94,7 @@ static inline void of_msi_configure(struct device *dev, struct device_node *np) */ extern unsigned int irq_of_parse_and_map(struct device_node *node, int index); u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in); +extern struct device_node *of_irq_find_parent(struct device_node *child); #else /* !CONFIG_OF && !CONFIG_SPARC */ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, @@ -107,6 +108,11 @@ static inline u32 of_msi_map_rid(struct device *dev, { return rid_in; } + +static inline void *of_irq_find_parent(struct device_node *child) +{ + return NULL; +} #endif /* !CONFIG_OF */ #endif /* __OF_IRQ_H */