diff mbox series

[U-Boot,2/2] ARM: asm/io.h: remove redundant #if !defined(readb) block

Message ID 20190910085144.4478-2-rasmus.villemoes@prevas.dk
State Accepted
Commit 26c106095188ef29c252c189fbf5261c59b88a10
Delegated to: Tom Rini
Headers show
Series [U-Boot,1/2] ARM: asm/io.h: kill off confusing #ifdef __mem_pci block | expand

Commit Message

Rasmus Villemoes Sept. 10, 2019, 8:51 a.m. UTC 
readb is unconditionally defined earlier in io.h, so there's no point
checking whether it's undefined.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
 arch/arm/include/asm/io.h | 15 ---------------
 1 file changed, 15 deletions(-)

Comments

Tom Rini Oct. 12, 2019, 8:23 p.m. UTC | #1 
On Tue, Sep 10, 2019 at 08:51:54AM +0000, Rasmus Villemoes wrote:

> readb is unconditionally defined earlier in io.h, so there's no point
> checking whether it's undefined.
> 
> Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 78b183d42f..723f3cf497 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -319,21 +319,6 @@  extern void __readwrite_bug(const char *fn);
 #define memcpy_fromio(a, b, c)		memcpy((a), (void *)(b), (c))
 #define memcpy_toio(a, b, c)		memcpy((void *)(a), (b), (c))
 
-#if !defined(readb)
-
-#define readb(addr)			(__readwrite_bug("readb"),0)
-#define readw(addr)			(__readwrite_bug("readw"),0)
-#define readl(addr)			(__readwrite_bug("readl"),0)
-#define writeb(v,addr)			__readwrite_bug("writeb")
-#define writew(v,addr)			__readwrite_bug("writew")
-#define writel(v,addr)			__readwrite_bug("writel")
-
-#define eth_io_copy_and_sum(a,b,c,d)	__readwrite_bug("eth_io_copy_and_sum")
-
-#define check_signature(io,sig,len)	(0)
-
-#endif
-
 /*
  * If this architecture has ISA IO, then define the isa_read/isa_write
  * macros.