diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-09-19 03:30:20 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-09-20 00:06:18 -0400 |
commit | 73ea9e1bcb8eea4f3b2052fe7ccd7ee4b5a271a0 (patch) | |
tree | be96595750908640a29fb5ad2a4a8224af2bb65e /arch | |
parent | 661f1cdb8b3e3c2c44e97df122c1d5643c054ce8 (diff) |
[POWERPC] clean up ide io accessors
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/misc.S | 12 | ||||
-rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 7 | ||||
-rw-r--r-- | arch/ppc/kernel/misc.S | 4 | ||||
-rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 5 |
4 files changed, 0 insertions, 28 deletions
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S index dd5f8e429196..6feb391422ec 100644 --- a/arch/powerpc/kernel/misc.S +++ b/arch/powerpc/kernel/misc.S | |||
@@ -86,9 +86,6 @@ _GLOBAL(_outsb) | |||
86 | sync | 86 | sync |
87 | blr | 87 | blr |
88 | 88 | ||
89 | #ifdef CONFIG_PPC32 | ||
90 | _GLOBAL(__ide_mm_insw) | ||
91 | #endif | ||
92 | _GLOBAL(_insw_ns) | 89 | _GLOBAL(_insw_ns) |
93 | sync | 90 | sync |
94 | cmpwi 0,r5,0 | 91 | cmpwi 0,r5,0 |
@@ -103,9 +100,6 @@ _GLOBAL(_insw_ns) | |||
103 | isync | 100 | isync |
104 | blr | 101 | blr |
105 | 102 | ||
106 | #ifdef CONFIG_PPC32 | ||
107 | _GLOBAL(__ide_mm_outsw) | ||
108 | #endif | ||
109 | _GLOBAL(_outsw_ns) | 103 | _GLOBAL(_outsw_ns) |
110 | cmpwi 0,r5,0 | 104 | cmpwi 0,r5,0 |
111 | mtctr r5 | 105 | mtctr r5 |
@@ -118,9 +112,6 @@ _GLOBAL(_outsw_ns) | |||
118 | sync | 112 | sync |
119 | blr | 113 | blr |
120 | 114 | ||
121 | #ifdef CONFIG_PPC32 | ||
122 | _GLOBAL(__ide_mm_insl) | ||
123 | #endif | ||
124 | _GLOBAL(_insl_ns) | 115 | _GLOBAL(_insl_ns) |
125 | sync | 116 | sync |
126 | cmpwi 0,r5,0 | 117 | cmpwi 0,r5,0 |
@@ -135,9 +126,6 @@ _GLOBAL(_insl_ns) | |||
135 | isync | 126 | isync |
136 | blr | 127 | blr |
137 | 128 | ||
138 | #ifdef CONFIG_PPC32 | ||
139 | _GLOBAL(__ide_mm_outsl) | ||
140 | #endif | ||
141 | _GLOBAL(_outsl_ns) | 129 | _GLOBAL(_outsl_ns) |
142 | cmpwi 0,r5,0 | 130 | cmpwi 0,r5,0 |
143 | mtctr r5 | 131 | mtctr r5 |
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index 314d6114e6ec..75429e580518 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
@@ -95,13 +95,6 @@ EXPORT_SYMBOL(__strnlen_user); | |||
95 | EXPORT_SYMBOL(copy_4K_page); | 95 | EXPORT_SYMBOL(copy_4K_page); |
96 | #endif | 96 | #endif |
97 | 97 | ||
98 | #ifndef __powerpc64__ | ||
99 | EXPORT_SYMBOL(__ide_mm_insl); | ||
100 | EXPORT_SYMBOL(__ide_mm_outsw); | ||
101 | EXPORT_SYMBOL(__ide_mm_insw); | ||
102 | EXPORT_SYMBOL(__ide_mm_outsl); | ||
103 | #endif | ||
104 | |||
105 | EXPORT_SYMBOL(_insb); | 98 | EXPORT_SYMBOL(_insb); |
106 | EXPORT_SYMBOL(_outsb); | 99 | EXPORT_SYMBOL(_outsb); |
107 | EXPORT_SYMBOL(_insw_ns); | 100 | EXPORT_SYMBOL(_insw_ns); |
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S index 44700bbfe7bc..50b4bbd06804 100644 --- a/arch/ppc/kernel/misc.S +++ b/arch/ppc/kernel/misc.S | |||
@@ -768,7 +768,6 @@ _GLOBAL(_outsb) | |||
768 | bdnz 00b | 768 | bdnz 00b |
769 | blr | 769 | blr |
770 | 770 | ||
771 | _GLOBAL(__ide_mm_insw) | ||
772 | _GLOBAL(_insw_ns) | 771 | _GLOBAL(_insw_ns) |
773 | cmpwi 0,r5,0 | 772 | cmpwi 0,r5,0 |
774 | mtctr r5 | 773 | mtctr r5 |
@@ -790,7 +789,6 @@ _GLOBAL(_insw_ns) | |||
790 | bdnz 00b | 789 | bdnz 00b |
791 | blr | 790 | blr |
792 | 791 | ||
793 | _GLOBAL(__ide_mm_outsw) | ||
794 | _GLOBAL(_outsw_ns) | 792 | _GLOBAL(_outsw_ns) |
795 | cmpwi 0,r5,0 | 793 | cmpwi 0,r5,0 |
796 | mtctr r5 | 794 | mtctr r5 |
@@ -812,7 +810,6 @@ _GLOBAL(_outsw_ns) | |||
812 | bdnz 00b | 810 | bdnz 00b |
813 | blr | 811 | blr |
814 | 812 | ||
815 | _GLOBAL(__ide_mm_insl) | ||
816 | _GLOBAL(_insl_ns) | 813 | _GLOBAL(_insl_ns) |
817 | cmpwi 0,r5,0 | 814 | cmpwi 0,r5,0 |
818 | mtctr r5 | 815 | mtctr r5 |
@@ -834,7 +831,6 @@ _GLOBAL(_insl_ns) | |||
834 | bdnz 00b | 831 | bdnz 00b |
835 | blr | 832 | blr |
836 | 833 | ||
837 | _GLOBAL(__ide_mm_outsl) | ||
838 | _GLOBAL(_outsl_ns) | 834 | _GLOBAL(_outsl_ns) |
839 | cmpwi 0,r5,0 | 835 | cmpwi 0,r5,0 |
840 | mtctr r5 | 836 | mtctr r5 |
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 2bd1f7353f56..c8b65ca8a350 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
@@ -115,11 +115,6 @@ EXPORT_SYMBOL(outw); | |||
115 | EXPORT_SYMBOL(outl); | 115 | EXPORT_SYMBOL(outl); |
116 | EXPORT_SYMBOL(outsl);*/ | 116 | EXPORT_SYMBOL(outsl);*/ |
117 | 117 | ||
118 | EXPORT_SYMBOL(__ide_mm_insl); | ||
119 | EXPORT_SYMBOL(__ide_mm_outsw); | ||
120 | EXPORT_SYMBOL(__ide_mm_insw); | ||
121 | EXPORT_SYMBOL(__ide_mm_outsl); | ||
122 | |||
123 | EXPORT_SYMBOL(_insb); | 118 | EXPORT_SYMBOL(_insb); |
124 | EXPORT_SYMBOL(_outsb); | 119 | EXPORT_SYMBOL(_outsb); |
125 | EXPORT_SYMBOL(_insw_ns); | 120 | EXPORT_SYMBOL(_insw_ns); |