This changes the dummy version of of_irq_find_parent to be defined when
!defined(CONFIG_OF_IRQ) instead of when !defined(CONFIG_OF). Without
this of_irq_find_parent is undefined on SPARC that defines CONFIG_OF but
not CONFIG_OF_IRQ.
Signed-off-by: Andreas Larsson <[email protected]>
---
include/linux/of_irq.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index 535cecf..d0059a9 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -83,11 +83,13 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
{
return 0;
}
+#endif /* !CONFIG_OF */
+
+#endif /* __OF_IRQ_H */
+#if !defined(CONFIG_OF_IRQ)
static inline void *of_irq_find_parent(struct device_node *child)
{
return NULL;
}
-#endif /* !CONFIG_OF */
-
-#endif /* __OF_IRQ_H */
+#endif /* !CONFIG_OF_IRQ */
--
1.7.10.4
On Tue, Aug 27, 2013 at 2:57 AM, Andreas Larsson <[email protected]> wrote:
> This changes the dummy version of of_irq_find_parent to be defined when
> !defined(CONFIG_OF_IRQ) instead of when !defined(CONFIG_OF). Without
> this of_irq_find_parent is undefined on SPARC that defines CONFIG_OF but
> not CONFIG_OF_IRQ.
Can you give me some clue about where the failure is. This function
has been here a while, so what changed?
Rob
>
> Signed-off-by: Andreas Larsson <[email protected]>
> ---
> include/linux/of_irq.h | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
> index 535cecf..d0059a9 100644
> --- a/include/linux/of_irq.h
> +++ b/include/linux/of_irq.h
> @@ -83,11 +83,13 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
> {
> return 0;
> }
> +#endif /* !CONFIG_OF */
> +
> +#endif /* __OF_IRQ_H */
>
> +#if !defined(CONFIG_OF_IRQ)
> static inline void *of_irq_find_parent(struct device_node *child)
> {
> return NULL;
> }
> -#endif /* !CONFIG_OF */
> -
> -#endif /* __OF_IRQ_H */
> +#endif /* !CONFIG_OF_IRQ */
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2013-08-27 15:12, Rob Herring wrote:
> On Tue, Aug 27, 2013 at 2:57 AM, Andreas Larsson <[email protected]> wrote:
>> This changes the dummy version of of_irq_find_parent to be defined when
>> !defined(CONFIG_OF_IRQ) instead of when !defined(CONFIG_OF). Without
>> this of_irq_find_parent is undefined on SPARC that defines CONFIG_OF but
>> not CONFIG_OF_IRQ.
>
> Can you give me some clue about where the failure is. This function
> has been here a while, so what changed?
There is no failure as far as I know at the moment.
An earlier version of a submitted patch concerning gpiolib-of.c
triggered compile failure on SPARC due to this situation (not an issue
in the latest version of that patch)
It is more of a failure waiting to happen, so this can wait until v3.12.
Cheers,
Andreas Larsson
> Rob
>
>>
>> Signed-off-by: Andreas Larsson <[email protected]>
>> ---
>> include/linux/of_irq.h | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
>> index 535cecf..d0059a9 100644
>> --- a/include/linux/of_irq.h
>> +++ b/include/linux/of_irq.h
>> @@ -83,11 +83,13 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
>> {
>> return 0;
>> }
>> +#endif /* !CONFIG_OF */
>> +
>> +#endif /* __OF_IRQ_H */
>>
>> +#if !defined(CONFIG_OF_IRQ)
>> static inline void *of_irq_find_parent(struct device_node *child)
>> {
>> return NULL;
>> }
>> -#endif /* !CONFIG_OF */
>> -
>> -#endif /* __OF_IRQ_H */
>> +#endif /* !CONFIG_OF_IRQ */
>> --
>> 1.7.10.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe devicetree" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html