[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>

diff --git a/include/asm-arm/arch-aaec2000/io.h b/include/asm-arm/arch-aaec2000/io.h
index 8d67907..d710204 100644 (file)
--- a/include/asm-arm/arch-aaec2000/io.h
+++ b/include/asm-arm/arch-aaec2000/io.h
@@ -16,6 +16,5 @@
  */
 #define __io(a)                        ((void __iomem *)(a))
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif

diff --git a/include/asm-arm/arch-clps711x/io.h b/include/asm-arm/arch-clps711x/io.h
index 62613b0..53d7902 100644 (file)
--- a/include/asm-arm/arch-clps711x/io.h
+++ b/include/asm-arm/arch-clps711x/io.h
@@ -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.

diff --git a/include/asm-arm/arch-ebsa285/io.h b/include/asm-arm/arch-ebsa285/io.h
index 776f9d3..f9c7291 100644 (file)
--- a/include/asm-arm/arch-ebsa285/io.h
+++ b/include/asm-arm/arch-ebsa285/io.h
@@ -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

diff --git a/include/asm-arm/arch-integrator/io.h b/include/asm-arm/arch-integrator/io.h
index 31f2dea..c8f2175 100644 (file)
--- a/include/asm-arm/arch-integrator/io.h
+++ b/include/asm-arm/arch-integrator/io.h
@@ -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

diff --git a/include/asm-arm/arch-iop3xx/io.h b/include/asm-arm/arch-iop3xx/io.h
index f39046a..36adbdf 100644 (file)
--- a/include/asm-arm/arch-iop3xx/io.h
+++ b/include/asm-arm/arch-iop3xx/io.h
@@ -17,6 +17,5 @@
 
 #define __io(p)                        ((void __iomem *)(p))
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif

diff --git a/include/asm-arm/arch-l7200/io.h b/include/asm-arm/arch-l7200/io.h
index cab8ad0..cd080d8 100644 (file)
--- a/include/asm-arm/arch-l7200/io.h
+++ b/include/asm-arm/arch-l7200/io.h
@@ -19,7 +19,6 @@
  */
 #define __io_pci(a)            ((void __iomem *)(PCIO_BASE + (a)))
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #define __ioaddr(p)             __io_pci(p)
 

diff --git a/include/asm-arm/arch-lh7a40x/io.h b/include/asm-arm/arch-lh7a40x/io.h
index bbcd433..17bc940 100644 (file)
--- a/include/asm-arm/arch-lh7a40x/io.h
+++ b/include/asm-arm/arch-lh7a40x/io.h
@@ -18,6 +18,5 @@
 /* No ISA or PCI bus on this machine. */
 #define __io(a)                        ((void __iomem *)(a))
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif /* __ASM_ARCH_IO_H */

diff --git a/include/asm-arm/arch-netx/io.h b/include/asm-arm/arch-netx/io.h
index 81b7bc4..a7a53f8 100644 (file)
--- a/include/asm-arm/arch-netx/io.h
+++ b/include/asm-arm/arch-netx/io.h
@@ -24,6 +24,5 @@
 
 #define __io(a)         ((void __iomem *)(a))
 #define __mem_pci(a)            (a)
-#define __mem_isa(a)            (a)
 
 #endif

diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h
index b726acf..78f68e6 100644 (file)
--- a/include/asm-arm/arch-omap/io.h
+++ b/include/asm-arm/arch-omap/io.h
@@ -44,7 +44,6 @@
  */
 #define __io(a)                        ((void __iomem *)(PCIO_BASE + (a)))
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 /*
  * ----------------------------------------------------------------------------

diff --git a/include/asm-arm/arch-pxa/io.h b/include/asm-arm/arch-pxa/io.h
index eb2dd58..7f8d817 100644 (file)
--- a/include/asm-arm/arch-pxa/io.h
+++ b/include/asm-arm/arch-pxa/io.h
@@ -16,6 +16,5 @@
  */
 #define __io(a)                        ((void __iomem *)(a))
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif

diff --git a/include/asm-arm/arch-realview/io.h b/include/asm-arm/arch-realview/io.h
index d444a68..c70f1df 100644 (file)
--- a/include/asm-arm/arch-realview/io.h
+++ b/include/asm-arm/arch-realview/io.h
@@ -29,6 +29,5 @@ static inline void __iomem *__io(unsigned long addr)
 
 #define __io(a)                        __io(a)
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif

diff --git a/include/asm-arm/arch-sa1100/io.h b/include/asm-arm/arch-sa1100/io.h
index 040ccde..0756269 100644 (file)
--- a/include/asm-arm/arch-sa1100/io.h
+++ b/include/asm-arm/arch-sa1100/io.h
@@ -22,6 +22,5 @@ static inline void __iomem *__io(unsigned long addr)
 }
 #define __io(a)                        __io(a)
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif

diff --git a/include/asm-arm/arch-versatile/io.h b/include/asm-arm/arch-versatile/io.h
index 47e904c..c4d0194 100644 (file)
--- a/include/asm-arm/arch-versatile/io.h
+++ b/include/asm-arm/arch-versatile/io.h
@@ -28,6 +28,5 @@ static inline void __iomem *__io(unsigned long addr)
 }
 #define __io(a)        __io(a)
 #define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
 
 #endif