Re: [PATCH] OF: of_address: clean up OF stub functions

[Laurent Pinchart]

Hi Randy,

Thank you for the patch.

On Sat, May 22, 2021 at 07:28:07PM -0700, Randy Dunlap wrote:
> Adjust <linux/of_address.h> so that stubs are present when
> CONFIG_OF is not set *or* OF is set but OF_ADDRESS is not set.
> 
> This eliminates 2 build errors on arch/s390/ when HAS_IOMEM
> is not set (so OF_ADDRESS is not set).
> I.e., it provides a stub for of_iomap() when one was previously
> not provided as well as removing some duplicate stubs.
> 
> s390-linux-ld: drivers/irqchip/irq-al-fic.o: in function `al_fic_init_dt':
> irq-al-fic.c:(.init.text+0x7a): undefined reference to `of_iomap'
> s390-linux-ld: drivers/clocksource/timer-of.o: in function `timer_of_init':
> timer-of.c:(.init.text+0xa4): undefined reference to `of_iomap'
> 
> Tested with many randconfig builds, but there could still be some
> hidden problem here.
> 
> Fixes: 4acf4b9cd453 ("of: move of_address_to_resource and of_iomap declarations from sparc")
> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Cc: Rob Herring <robh+dt@xxxxxxxxxx>
> Cc: Frank Rowand <frowand.list@xxxxxxxxx>
> Cc: devicetree@xxxxxxxxxxxxxxx
> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
>  include/linux/of_address.h |    6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> --- linux-next-20210521.orig/include/linux/of_address.h
> +++ linux-next-20210521/include/linux/of_address.h
> @@ -106,11 +106,7 @@ static inline bool of_dma_is_coherent(st
>  }
>  #endif /* CONFIG_OF_ADDRESS */
>  
> -#ifdef CONFIG_OF
> -extern int of_address_to_resource(struct device_node *dev, int index,
> -				  struct resource *r);
> -void __iomem *of_iomap(struct device_node *node, int index);
> -#else
> +#if defined(CONFIG_OF) && !defined(CONFIG_OF_ADDRESS) || !defined(CONFIG_OF)

Parentheses would help making the precedence order clear.

On sparc, CONFIG_OF is set, CONFIG_OF_ADDRESS isn't, and
of_address_to_resource() is provided by arch code. You'll stub it out
here, which doesn't seem correct to me.

>  static inline int of_address_to_resource(struct device_node *dev, int index,
>  					 struct resource *r)
>  {

-- 
Regards,

Laurent Pinchart