aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-09-19 02:52:55 -0400
committerStephen Rothwell <sfr@canb.auug.org.au>2006-09-20 00:06:18 -0400
commit661f1cdb8b3e3c2c44e97df122c1d5643c054ce8 (patch)
tree9f540dda2d57d2ec2fcec5aee3b7f0a4c7992d94
parentfa053d2f008cb73fa768b8e171486d8c0b33312b (diff)
[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>
-rw-r--r--arch/powerpc/kernel/misc.S52
-rw-r--r--arch/powerpc/kernel/ppc_ksyms.c4
-rw-r--r--arch/ppc/kernel/misc.S84
-rw-r--r--arch/ppc/kernel/ppc_ksyms.c4
-rw-r--r--include/asm-powerpc/io.h4
-rw-r--r--include/asm-ppc/io.h4
6 files changed, 0 insertions, 152 deletions
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index f770805f1215..dd5f8e429196 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -86,58 +86,6 @@ _GLOBAL(_outsb)
86 sync 86 sync
87 blr 87 blr
88 88
89_GLOBAL(_insw)
90 sync
91 cmpwi 0,r5,0
92 mtctr r5
93 subi r4,r4,2
94 blelr-
9500: lhbrx r5,0,r3
96 eieio
97 sthu r5,2(r4)
98 bdnz 00b
99 twi 0,r5,0
100 isync
101 blr
102
103_GLOBAL(_outsw)
104 cmpwi 0,r5,0
105 mtctr r5
106 subi r4,r4,2
107 blelr-
108 sync
10900: lhzu r5,2(r4)
110 sthbrx r5,0,r3
111 bdnz 00b
112 sync
113 blr
114
115_GLOBAL(_insl)
116 sync
117 cmpwi 0,r5,0
118 mtctr r5
119 subi r4,r4,4
120 blelr-
12100: lwbrx r5,0,r3
122 eieio
123 stwu r5,4(r4)
124 bdnz 00b
125 twi 0,r5,0
126 isync
127 blr
128
129_GLOBAL(_outsl)
130 cmpwi 0,r5,0
131 mtctr r5
132 subi r4,r4,4
133 blelr-
134 sync
13500: lwzu r5,4(r4)
136 stwbrx r5,0,r3
137 bdnz 00b
138 sync
139 blr
140
141#ifdef CONFIG_PPC32 89#ifdef CONFIG_PPC32
142_GLOBAL(__ide_mm_insw) 90_GLOBAL(__ide_mm_insw)
143#endif 91#endif
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index b2edac8ddf0a..314d6114e6ec 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -104,10 +104,6 @@ EXPORT_SYMBOL(__ide_mm_outsl);
104 104
105EXPORT_SYMBOL(_insb); 105EXPORT_SYMBOL(_insb);
106EXPORT_SYMBOL(_outsb); 106EXPORT_SYMBOL(_outsb);
107EXPORT_SYMBOL(_insw);
108EXPORT_SYMBOL(_outsw);
109EXPORT_SYMBOL(_insl);
110EXPORT_SYMBOL(_outsl);
111EXPORT_SYMBOL(_insw_ns); 107EXPORT_SYMBOL(_insw_ns);
112EXPORT_SYMBOL(_outsw_ns); 108EXPORT_SYMBOL(_outsw_ns);
113EXPORT_SYMBOL(_insl_ns); 109EXPORT_SYMBOL(_insl_ns);
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index 2fa0075f2b5f..44700bbfe7bc 100644
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -768,90 +768,6 @@ _GLOBAL(_outsb)
768 bdnz 00b 768 bdnz 00b
769 blr 769 blr
770 770
771_GLOBAL(_insw)
772 cmpwi 0,r5,0
773 mtctr r5
774 subi r4,r4,2
775 blelr-
77600: lhbrx r5,0,r3
77701: eieio
77802: sthu r5,2(r4)
779 ISYNC_8xx
780 .section .fixup,"ax"
78103: blr
782 .text
783 .section __ex_table, "a"
784 .align 2
785 .long 00b, 03b
786 .long 01b, 03b
787 .long 02b, 03b
788 .text
789 bdnz 00b
790 blr
791
792_GLOBAL(_outsw)
793 cmpwi 0,r5,0
794 mtctr r5
795 subi r4,r4,2
796 blelr-
79700: lhzu r5,2(r4)
79801: eieio
79902: sthbrx r5,0,r3
800 ISYNC_8xx
801 .section .fixup,"ax"
80203: blr
803 .text
804 .section __ex_table, "a"
805 .align 2
806 .long 00b, 03b
807 .long 01b, 03b
808 .long 02b, 03b
809 .text
810 bdnz 00b
811 blr
812
813_GLOBAL(_insl)
814 cmpwi 0,r5,0
815 mtctr r5
816 subi r4,r4,4
817 blelr-
81800: lwbrx r5,0,r3
81901: eieio
82002: stwu r5,4(r4)
821 ISYNC_8xx
822 .section .fixup,"ax"
82303: blr
824 .text
825 .section __ex_table, "a"
826 .align 2
827 .long 00b, 03b
828 .long 01b, 03b
829 .long 02b, 03b
830 .text
831 bdnz 00b
832 blr
833
834_GLOBAL(_outsl)
835 cmpwi 0,r5,0
836 mtctr r5
837 subi r4,r4,4
838 blelr-
83900: lwzu r5,4(r4)
84001: stwbrx r5,0,r3
84102: eieio
842 ISYNC_8xx
843 .section .fixup,"ax"
84403: blr
845 .text
846 .section __ex_table, "a"
847 .align 2
848 .long 00b, 03b
849 .long 01b, 03b
850 .long 02b, 03b
851 .text
852 bdnz 00b
853 blr
854
855_GLOBAL(__ide_mm_insw) 771_GLOBAL(__ide_mm_insw)
856_GLOBAL(_insw_ns) 772_GLOBAL(_insw_ns)
857 cmpwi 0,r5,0 773 cmpwi 0,r5,0
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index d1735401384c..2bd1f7353f56 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -122,10 +122,6 @@ EXPORT_SYMBOL(__ide_mm_outsl);
122 122
123EXPORT_SYMBOL(_insb); 123EXPORT_SYMBOL(_insb);
124EXPORT_SYMBOL(_outsb); 124EXPORT_SYMBOL(_outsb);
125EXPORT_SYMBOL(_insw);
126EXPORT_SYMBOL(_outsw);
127EXPORT_SYMBOL(_insl);
128EXPORT_SYMBOL(_outsl);
129EXPORT_SYMBOL(_insw_ns); 125EXPORT_SYMBOL(_insw_ns);
130EXPORT_SYMBOL(_outsw_ns); 126EXPORT_SYMBOL(_outsw_ns);
131EXPORT_SYMBOL(_insl_ns); 127EXPORT_SYMBOL(_insl_ns);
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 9aaced542624..0ee48436b1e3 100644
--- 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)
151 151
152extern void _insb(volatile u8 __iomem *port, void *buf, int ns); 152extern void _insb(volatile u8 __iomem *port, void *buf, int ns);
153extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns); 153extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns);
154extern void _insw(volatile u16 __iomem *port, void *buf, int ns);
155extern void _outsw(volatile u16 __iomem *port, const void *buf, int ns);
156extern void _insl(volatile u32 __iomem *port, void *buf, int nl);
157extern void _outsl(volatile u32 __iomem *port, const void *buf, int nl);
158extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns); 154extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns);
159extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns); 155extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);
160extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl); 156extern 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 fb0a8fcc51cf..9fac420f1648 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -329,10 +329,6 @@ __do_out_asm(outl, "stwbrx")
329 329
330extern void _insb(volatile u8 __iomem *port, void *buf, int ns); 330extern void _insb(volatile u8 __iomem *port, void *buf, int ns);
331extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns); 331extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns);
332extern void _insw(volatile u16 __iomem *port, void *buf, int ns);
333extern void _outsw(volatile u16 __iomem *port, const void *buf, int ns);
334extern void _insl(volatile u32 __iomem *port, void *buf, int nl);
335extern void _outsl(volatile u32 __iomem *port, const void *buf, int nl);
336extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns); 332extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns);
337extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns); 333extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);
338extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl); 334extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);