[POWERPC] remove unused asm routines

_insw, _outsw, _insl amd _outsl are all unused, so remove them.

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 f770805f1215df787d7840e3acbc7692cd228503..dd5f8e4291968401c5b29b957239f2aa3d0c09fc 100644 (file)
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -86,58 +86,6 @@ _GLOBAL(_outsb)
        sync
        blr
 
-_GLOBAL(_insw)
-       sync
-       cmpwi   0,r5,0
-       mtctr   r5
-       subi    r4,r4,2
-       blelr-
-00:    lhbrx   r5,0,r3
-       eieio
-       sthu    r5,2(r4)
-       bdnz    00b
-       twi     0,r5,0
-       isync
-       blr
-
-_GLOBAL(_outsw)
-       cmpwi   0,r5,0
-       mtctr   r5
-       subi    r4,r4,2
-       blelr-
-       sync
-00:    lhzu    r5,2(r4)
-       sthbrx  r5,0,r3
-       bdnz    00b
-       sync
-       blr
-
-_GLOBAL(_insl)
-       sync
-       cmpwi   0,r5,0
-       mtctr   r5
-       subi    r4,r4,4
-       blelr-
-00:    lwbrx   r5,0,r3
-       eieio
-       stwu    r5,4(r4)
-       bdnz    00b
-       twi     0,r5,0
-       isync
-       blr
-
-_GLOBAL(_outsl)
-       cmpwi   0,r5,0
-       mtctr   r5
-       subi    r4,r4,4
-       blelr-
-       sync
-00:    lwzu    r5,4(r4)
-       stwbrx  r5,0,r3
-       bdnz    00b
-       sync
-       blr
-
 #ifdef CONFIG_PPC32
 _GLOBAL(__ide_mm_insw)
 #endif

diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index b2edac8ddf0a5281c9635c4d5913092d4cf19918..314d6114e6ec13ccc6c9f990420ede414e6d0e0b 100644 (file)
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -104,10 +104,6 @@ EXPORT_SYMBOL(__ide_mm_outsl);
 
 EXPORT_SYMBOL(_insb);
 EXPORT_SYMBOL(_outsb);
-EXPORT_SYMBOL(_insw);
-EXPORT_SYMBOL(_outsw);
-EXPORT_SYMBOL(_insl);
-EXPORT_SYMBOL(_outsl);
 EXPORT_SYMBOL(_insw_ns);
 EXPORT_SYMBOL(_outsw_ns);
 EXPORT_SYMBOL(_insl_ns);

diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index 2fa0075f2b5f832f122d1ac196b011da9918dfde..44700bbfe7bc231106f1099372d923eeaa098f54 100644 (file)
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -768,90 +768,6 @@ _GLOBAL(_outsb)
        bdnz    00b
        blr
 
-_GLOBAL(_insw)
-       cmpwi   0,r5,0
-       mtctr   r5
-       subi    r4,r4,2
-       blelr-
-00:    lhbrx   r5,0,r3
-01:    eieio
-02:    sthu    r5,2(r4)
-       ISYNC_8xx
-       .section .fixup,"ax"
-03:    blr
-       .text
-       .section __ex_table, "a"
-               .align 2
-               .long 00b, 03b
-               .long 01b, 03b
-               .long 02b, 03b
-       .text
-       bdnz    00b
-       blr
-
-_GLOBAL(_outsw)
-       cmpwi   0,r5,0
-       mtctr   r5
-       subi    r4,r4,2
-       blelr-
-00:    lhzu    r5,2(r4)
-01:    eieio
-02:    sthbrx  r5,0,r3
-       ISYNC_8xx
-       .section .fixup,"ax"
-03:    blr
-       .text
-       .section __ex_table, "a"
-               .align 2
-               .long 00b, 03b
-               .long 01b, 03b
-               .long 02b, 03b
-       .text
-       bdnz    00b
-       blr
-
-_GLOBAL(_insl)
-       cmpwi   0,r5,0
-       mtctr   r5
-       subi    r4,r4,4
-       blelr-
-00:    lwbrx   r5,0,r3
-01:    eieio
-02:    stwu    r5,4(r4)
-       ISYNC_8xx
-       .section .fixup,"ax"
-03:    blr
-       .text
-       .section __ex_table, "a"
-               .align 2
-               .long 00b, 03b
-               .long 01b, 03b
-               .long 02b, 03b
-       .text
-       bdnz    00b
-       blr
-
-_GLOBAL(_outsl)
-       cmpwi   0,r5,0
-       mtctr   r5
-       subi    r4,r4,4
-       blelr-
-00:    lwzu    r5,4(r4)
-01:    stwbrx  r5,0,r3
-02:    eieio
-       ISYNC_8xx
-       .section .fixup,"ax"
-03:    blr
-       .text
-       .section __ex_table, "a"
-               .align 2
-               .long 00b, 03b
-               .long 01b, 03b
-               .long 02b, 03b
-       .text
-       bdnz    00b
-       blr
-
 _GLOBAL(__ide_mm_insw)
 _GLOBAL(_insw_ns)
        cmpwi   0,r5,0

diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index d1735401384cbb6732aa19fe87d4f9b2607fe22c..2bd1f7353f56a8a6f7d5aa778f684df115f319d9 100644 (file)
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -122,10 +122,6 @@ EXPORT_SYMBOL(__ide_mm_outsl);
 
 EXPORT_SYMBOL(_insb);
 EXPORT_SYMBOL(_outsb);
-EXPORT_SYMBOL(_insw);
-EXPORT_SYMBOL(_outsw);
-EXPORT_SYMBOL(_insl);
-EXPORT_SYMBOL(_outsl);
 EXPORT_SYMBOL(_insw_ns);
 EXPORT_SYMBOL(_outsw_ns);
 EXPORT_SYMBOL(_insl_ns);

diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 9aaced542624276180b0e705c91c65b1c627b73f..0ee48436b1e309eaf5180fbb9e0ecb647822f818 100644 (file)
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -151,10 +151,6 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
 
 extern void _insb(volatile u8 __iomem *port, void *buf, int ns);
 extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns);
-extern void _insw(volatile u16 __iomem *port, void *buf, int ns);
-extern void _outsw(volatile u16 __iomem *port, const void *buf, int ns);
-extern void _insl(volatile u32 __iomem *port, void *buf, int nl);
-extern void _outsl(volatile u32 __iomem *port, const void *buf, int nl);
 extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns);
 extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);
 extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);

diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index fb0a8fcc51cf0c657f164ca4bd42ab0f1c1cc77c..9fac420f16484cb512a98d6605a218abb081260e 100644 (file)
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -329,10 +329,6 @@ __do_out_asm(outl, "stwbrx")
 
 extern void _insb(volatile u8 __iomem *port, void *buf, int ns);
 extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns);
-extern void _insw(volatile u16 __iomem *port, void *buf, int ns);
-extern void _outsw(volatile u16 __iomem *port, const void *buf, int ns);
-extern void _insl(volatile u32 __iomem *port, void *buf, int nl);
-extern void _outsl(volatile u32 __iomem *port, const void *buf, int nl);
 extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns);
 extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);
 extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);