tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Andrew Victor and committed by
Russell King 52e3e772 fc8ea7a1

-20
-1
include/asm-arm/arch-aaec2000/io.h
··· 16 16 */ 17 17 #define __io(a) ((void __iomem *)(a)) 18 18 #define __mem_pci(a) (a) 19 - #define __mem_isa(a) (a) 20 19 21 20 #endif
-1
include/asm-arm/arch-clps711x/io.h
··· 26 26 27 27 #define __io(a) ((void __iomem *)(a)) 28 28 #define __mem_pci(a) (a) 29 - #define __mem_isa(a) (a) 30 29 31 30 /* 32 31 * We don't support ins[lb]/outs[lb]. Make them fault.
-8
include/asm-arm/arch-ebsa285/io.h
··· 24 24 #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) 25 25 #if 1 26 26 #define __mem_pci(a) (a) 27 - #define __mem_isa(a) ((a) + PCIMEM_BASE) 28 27 #else 29 28 30 29 static inline void __iomem *___mem_pci(void __iomem *p) ··· 33 34 return p; 34 35 } 35 36 36 - static inline void __iomem *___mem_isa(void __iomem *p) 37 - { 38 - unsigned long a = (unsigned long)p; 39 - BUG_ON(a >= 16*1048576); 40 - return p + PCIMEM_BASE; 41 - } 42 37 #define __mem_pci(a) ___mem_pci(a) 43 - #define __mem_isa(a) ___mem_isa(a) 44 38 #endif 45 39 46 40 #endif
-1
include/asm-arm/arch-integrator/io.h
··· 32 32 33 33 #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a))) 34 34 #define __mem_pci(a) (a) 35 - #define __mem_isa(a) ((a) + PCI_MEMORY_VADDR) 36 35 37 36 #endif
-1
include/asm-arm/arch-iop3xx/io.h
··· 17 17 18 18 #define __io(p) ((void __iomem *)(p)) 19 19 #define __mem_pci(a) (a) 20 - #define __mem_isa(a) (a) 21 20 22 21 #endif
-1
include/asm-arm/arch-l7200/io.h
··· 19 19 */ 20 20 #define __io_pci(a) ((void __iomem *)(PCIO_BASE + (a))) 21 21 #define __mem_pci(a) (a) 22 - #define __mem_isa(a) (a) 23 22 24 23 #define __ioaddr(p) __io_pci(p) 25 24
-1
include/asm-arm/arch-lh7a40x/io.h
··· 18 18 /* No ISA or PCI bus on this machine. */ 19 19 #define __io(a) ((void __iomem *)(a)) 20 20 #define __mem_pci(a) (a) 21 - #define __mem_isa(a) (a) 22 21 23 22 #endif /* __ASM_ARCH_IO_H */
-1
include/asm-arm/arch-netx/io.h
··· 24 24 25 25 #define __io(a) ((void __iomem *)(a)) 26 26 #define __mem_pci(a) (a) 27 - #define __mem_isa(a) (a) 28 27 29 28 #endif
-1
include/asm-arm/arch-omap/io.h
··· 44 44 */ 45 45 #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) 46 46 #define __mem_pci(a) (a) 47 - #define __mem_isa(a) (a) 48 47 49 48 /* 50 49 * ----------------------------------------------------------------------------
-1
include/asm-arm/arch-pxa/io.h
··· 16 16 */ 17 17 #define __io(a) ((void __iomem *)(a)) 18 18 #define __mem_pci(a) (a) 19 - #define __mem_isa(a) (a) 20 19 21 20 #endif
-1
include/asm-arm/arch-realview/io.h
··· 29 29 30 30 #define __io(a) __io(a) 31 31 #define __mem_pci(a) (a) 32 - #define __mem_isa(a) (a) 33 32 34 33 #endif
-1
include/asm-arm/arch-sa1100/io.h
··· 22 22 } 23 23 #define __io(a) __io(a) 24 24 #define __mem_pci(a) (a) 25 - #define __mem_isa(a) (a) 26 25 27 26 #endif
-1
include/asm-arm/arch-versatile/io.h
··· 28 28 } 29 29 #define __io(a) __io(a) 30 30 #define __mem_pci(a) (a) 31 - #define __mem_isa(a) (a) 32 31 33 32 #endif