[U-Boot] [PATCH v2 1/3] net: sh-eth: fix inl and outl definitions

Chris Brandt chris.brandt at renesas.com
Fri Nov 3 13:30:11 UTC 2017


The macros inl and outl maybe already be defined from file
arch/arm/include/asm/io.h so there may be no reason to define them.
And if you do try defined them here, you get a redefined complier warning.

Signed-off-by: Chris Brandt <chris.brandt at renesas.com>
---
 drivers/net/sh_eth.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index 3645f0eca7..2345c34368 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -25,8 +25,10 @@
 #define ADDR_TO_PHY(addr)	((int)(addr) & ~0xe0000000)
 #endif
 #elif defined(CONFIG_ARM)
-#define inl		readl
+#ifndef inl
+#define inl	readl
 #define outl	writel
+#endif
 #define ADDR_TO_PHY(addr)	((int)(addr))
 #define ADDR_TO_P2(addr)	(addr)
 #endif /* defined(CONFIG_SH) */
-- 
2.14.1




More information about the U-Boot mailing list