Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52e3e772 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 3631/1: Remove legacy __mem_isa() definitions 



Patch from Andrew Victor

Remove the remaining legacy __mem_isa() definitions for the ARM
platforms.

Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fc8ea7a1

include/asm-arm/arch-aaec2000/io.h

+0 −1
Original line number Diff line number Diff line
@@ -16,6 +16,5 @@ 
 */

#define __io(a)			((void __iomem *)(a))

#define __mem_pci(a)		(a)

#define __mem_isa(a)		(a)



#endif

include/asm-arm/arch-clps711x/io.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 


#define __io(a)			((void __iomem *)(a))

#define __mem_pci(a)		(a)

#define __mem_isa(a)		(a)



/*

 * We don't support ins[lb]/outs[lb].  Make them fault.

include/asm-arm/arch-ebsa285/io.h

+0 −8
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#define __io(a)			((void __iomem *)(PCIO_BASE + (a)))

#if 1

#define __mem_pci(a)		(a)

#define __mem_isa(a)		((a) + PCIMEM_BASE)

#else



static inline void __iomem *___mem_pci(void __iomem *p)
@@ -34,14 +33,7 @@ static inline void __iomem *___mem_pci(void __iomem *p) 
	return p;

}



static inline void __iomem *___mem_isa(void __iomem *p)

{

	unsigned long a = (unsigned long)p;

	BUG_ON(a >= 16*1048576);

	return p + PCIMEM_BASE;

}

#define __mem_pci(a)		___mem_pci(a)

#define __mem_isa(a)		___mem_isa(a)

#endif



#endif

include/asm-arm/arch-integrator/io.h

+0 −1
Original line number Diff line number Diff line
@@ -32,6 +32,5 @@ 


#define __io(a)			((void __iomem *)(PCI_IO_VADDR + (a)))

#define __mem_pci(a)		(a)

#define __mem_isa(a)		((a) + PCI_MEMORY_VADDR)



#endif

include/asm-arm/arch-iop3xx/io.h

+0 −1
Original line number Diff line number Diff line
@@ -17,6 +17,5 @@ 


#define __io(p)			((void __iomem *)(p))

#define __mem_pci(a)		(a)

#define __mem_isa(a)		(a)



#endif