[POWERPC] clean up ide io accessors

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index dd5f8e4291968401c5b29b957239f2aa3d0c09fc..6feb391422ec3e0669b02f6459e0a0a371175502 100644 (file)
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -86,9 +86,6 @@ _GLOBAL(_outsb)
        sync
        blr
 
-#ifdef CONFIG_PPC32
-_GLOBAL(__ide_mm_insw)
-#endif
 _GLOBAL(_insw_ns)
        sync
        cmpwi   0,r5,0
@@ -103,9 +100,6 @@ _GLOBAL(_insw_ns)
        isync
        blr
 
-#ifdef CONFIG_PPC32
-_GLOBAL(__ide_mm_outsw)
-#endif
 _GLOBAL(_outsw_ns)
        cmpwi   0,r5,0
        mtctr   r5
@@ -118,9 +112,6 @@ _GLOBAL(_outsw_ns)
        sync
        blr
 
-#ifdef CONFIG_PPC32
-_GLOBAL(__ide_mm_insl)
-#endif
 _GLOBAL(_insl_ns)
        sync
        cmpwi   0,r5,0
@@ -135,9 +126,6 @@ _GLOBAL(_insl_ns)
        isync
        blr
 
-#ifdef CONFIG_PPC32
-_GLOBAL(__ide_mm_outsl)
-#endif
 _GLOBAL(_outsl_ns)
        cmpwi   0,r5,0
        mtctr   r5

diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 314d6114e6ec13ccc6c9f990420ede414e6d0e0b..75429e580518b08111a8df4052f2c0fd7532a7eb 100644 (file)
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -95,13 +95,6 @@ EXPORT_SYMBOL(__strnlen_user);
 EXPORT_SYMBOL(copy_4K_page);
 #endif
 
-#ifndef  __powerpc64__
-EXPORT_SYMBOL(__ide_mm_insl);
-EXPORT_SYMBOL(__ide_mm_outsw);
-EXPORT_SYMBOL(__ide_mm_insw);
-EXPORT_SYMBOL(__ide_mm_outsl);
-#endif
-
 EXPORT_SYMBOL(_insb);
 EXPORT_SYMBOL(_outsb);
 EXPORT_SYMBOL(_insw_ns);

diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index 44700bbfe7bc231106f1099372d923eeaa098f54..50b4bbd06804b123a443ab0420e824a1ebaf2bc8 100644 (file)
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -768,7 +768,6 @@ _GLOBAL(_outsb)
        bdnz    00b
        blr
 
-_GLOBAL(__ide_mm_insw)
 _GLOBAL(_insw_ns)
        cmpwi   0,r5,0
        mtctr   r5
@@ -790,7 +789,6 @@ _GLOBAL(_insw_ns)
        bdnz    00b
        blr
 
-_GLOBAL(__ide_mm_outsw)
 _GLOBAL(_outsw_ns)
        cmpwi   0,r5,0
        mtctr   r5
@@ -812,7 +810,6 @@ _GLOBAL(_outsw_ns)
        bdnz    00b
        blr
 
-_GLOBAL(__ide_mm_insl)
 _GLOBAL(_insl_ns)
        cmpwi   0,r5,0
        mtctr   r5
@@ -834,7 +831,6 @@ _GLOBAL(_insl_ns)
        bdnz    00b
        blr
 
-_GLOBAL(__ide_mm_outsl)
 _GLOBAL(_outsl_ns)
        cmpwi   0,r5,0
        mtctr   r5

diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 2bd1f7353f56a8a6f7d5aa778f684df115f319d9..c8b65ca8a350e8c5ecc8c5acc90c4f0b845ecbc1 100644 (file)
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -115,11 +115,6 @@ EXPORT_SYMBOL(outw);
 EXPORT_SYMBOL(outl);
 EXPORT_SYMBOL(outsl);*/
 
-EXPORT_SYMBOL(__ide_mm_insl);
-EXPORT_SYMBOL(__ide_mm_outsw);
-EXPORT_SYMBOL(__ide_mm_insw);
-EXPORT_SYMBOL(__ide_mm_outsl);
-
 EXPORT_SYMBOL(_insb);
 EXPORT_SYMBOL(_outsb);
 EXPORT_SYMBOL(_insw_ns);

diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h
index b09b42af6a1ef59b1977e0784690721afc5e9b3d..c8390f9485de9dd6ee6c9cfc13dab1a218c7e00a 100644 (file)
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -12,6 +12,7 @@
 #include <linux/sched.h>
 #include <asm/mpc8xx.h>
 #endif
+#include <asm/io.h>
 
 #ifndef MAX_HWIFS
 #ifdef __powerpc64__
@@ -21,15 +22,14 @@
 #endif
 #endif
 
+#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c))
+#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c))
+#define __ide_mm_outsw(p, a, c)        _outsw_ns((volatile u16 __iomem *)(p), (a), (c))
+#define __ide_mm_outsl(p, a, c)        _outsl_ns((volatile u32 __iomem *)(p), (a), (c))
+
 #ifndef  __powerpc64__
 #include <linux/hdreg.h>
 #include <linux/ioport.h>
-#include <asm/io.h>
-
-extern void __ide_mm_insw(void __iomem *port, void *addr, u32 count);
-extern void __ide_mm_outsw(void __iomem *port, void *addr, u32 count);
-extern void __ide_mm_insl(void __iomem *port, void *addr, u32 count);
-extern void __ide_mm_outsl(void __iomem *port, void *addr, u32 count);
 
 struct ide_machdep_calls {
         int         (*default_irq)(unsigned long base);

diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 0ee48436b1e309eaf5180fbb9e0ecb647822f818..51a598747367aedb9e12696588539fd2d83efcc6 100644 (file)
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -28,12 +28,6 @@ extern int check_legacy_ioport(unsigned long base_port);
 
 #include <asm-generic/iomap.h>
 
-#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c))
-#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c))
-#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c))
-#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c))
-
-
 #define SIO_CONFIG_RA  0x398
 #define SIO_CONFIG_RD  0x399