[PATCH] of: remove duplicate declaration of of_iomap()

From: trix
Date: Tue Sep 28 2021 - 16:12:37 EST


From: Tom Rix <trix@xxxxxxxxxx>

A ranconfig produces this linker error
irq-al-fic.c:252: undefined reference to `of_iomap'

The declaration of of_iomap() is dependent on OF
The definition of of_iomap() is dependent on OF_ADDRESS
These should match. There are duplicate declarations
of of_iomap(), remove of_iomap() and the
of_address_to_resource() duplicate.

Signed-off-by: Tom Rix <trix@xxxxxxxxxx>
---
include/linux/of_address.h | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 45598dbec269..a190996b4b0b 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -122,13 +122,7 @@ static inline bool of_dma_is_coherent(struct device_node *np)
{
return false;
}
-#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
static inline int of_address_to_resource(struct device_node *dev, int index,
struct resource *r)
{
@@ -139,7 +133,7 @@ static inline void __iomem *of_iomap(struct device_node *device, int index)
{
return NULL;
}
-#endif
+#endif /* CONFIG_OF_ADDRESS */
#define of_range_parser_init of_pci_range_parser_init

static inline const __be32 *of_get_address(struct device_node *dev, int index,
--
2.26.3