Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 73ea9e1bcb8eea4f3b2052fe7ccd7ee4b5a271a0

Authored by Stephen Rothwell
1 parent 661f1cdb8b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[POWERPC] clean up ide io accessors 

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

Showing 6 changed files with 6 additions and 40 deletions Side-by-side Diff

arch/powerpc/kernel/misc.S
Diff comments   View file @ 73ea9e1
... ... @@ -86,9 +86,6 @@
86 86 sync
87 87 blr
88 88  
89   -#ifdef CONFIG_PPC32
90   -_GLOBAL(__ide_mm_insw)
91   -#endif
92 89 _GLOBAL(_insw_ns)
93 90 sync
94 91 cmpwi 0,r5,0
... ... @@ -103,9 +100,6 @@
103 100 isync
104 101 blr
105 102  
106   -#ifdef CONFIG_PPC32
107   -_GLOBAL(__ide_mm_outsw)
108   -#endif
109 103 _GLOBAL(_outsw_ns)
110 104 cmpwi 0,r5,0
111 105 mtctr r5
... ... @@ -118,9 +112,6 @@
118 112 sync
119 113 blr
120 114  
121   -#ifdef CONFIG_PPC32
122   -_GLOBAL(__ide_mm_insl)
123   -#endif
124 115 _GLOBAL(_insl_ns)
125 116 sync
126 117 cmpwi 0,r5,0
... ... @@ -135,9 +126,6 @@
135 126 isync
136 127 blr
137 128  
138   -#ifdef CONFIG_PPC32
139   -_GLOBAL(__ide_mm_outsl)
140   -#endif
141 129 _GLOBAL(_outsl_ns)
142 130 cmpwi 0,r5,0
143 131 mtctr r5
arch/powerpc/kernel/ppc_ksyms.c
Diff comments   View file @ 73ea9e1
... ... @@ -95,13 +95,6 @@
95 95 EXPORT_SYMBOL(copy_4K_page);
96 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 98 EXPORT_SYMBOL(_insb);
106 99 EXPORT_SYMBOL(_outsb);
107 100 EXPORT_SYMBOL(_insw_ns);
arch/ppc/kernel/misc.S
Diff comments   View file @ 73ea9e1
... ... @@ -768,7 +768,6 @@
768 768 bdnz 00b
769 769 blr
770 770  
771   -_GLOBAL(__ide_mm_insw)
772 771 _GLOBAL(_insw_ns)
773 772 cmpwi 0,r5,0
774 773 mtctr r5
... ... @@ -790,7 +789,6 @@
790 789 bdnz 00b
791 790 blr
792 791  
793   -_GLOBAL(__ide_mm_outsw)
794 792 _GLOBAL(_outsw_ns)
795 793 cmpwi 0,r5,0
796 794 mtctr r5
... ... @@ -812,7 +810,6 @@
812 810 bdnz 00b
813 811 blr
814 812  
815   -_GLOBAL(__ide_mm_insl)
816 813 _GLOBAL(_insl_ns)
817 814 cmpwi 0,r5,0
818 815 mtctr r5
... ... @@ -834,7 +831,6 @@
834 831 bdnz 00b
835 832 blr
836 833  
837   -_GLOBAL(__ide_mm_outsl)
838 834 _GLOBAL(_outsl_ns)
839 835 cmpwi 0,r5,0
840 836 mtctr r5
arch/ppc/kernel/ppc_ksyms.c
Diff comments   View file @ 73ea9e1
... ... @@ -115,11 +115,6 @@
115 115 EXPORT_SYMBOL(outl);
116 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 118 EXPORT_SYMBOL(_insb);
124 119 EXPORT_SYMBOL(_outsb);
125 120 EXPORT_SYMBOL(_insw_ns);
include/asm-powerpc/ide.h
Diff comments   View file @ 73ea9e1
... ... @@ -12,6 +12,7 @@
12 12 #include <linux/sched.h>
13 13 #include <asm/mpc8xx.h>
14 14 #endif
  15 +#include <asm/io.h>
15 16  
16 17 #ifndef MAX_HWIFS
17 18 #ifdef __powerpc64__
18 19  
... ... @@ -21,15 +22,14 @@
21 22 #endif
22 23 #endif
23 24  
  25 +#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c))
  26 +#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c))
  27 +#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c))
  28 +#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c))
  29 +
24 30 #ifndef __powerpc64__
25 31 #include <linux/hdreg.h>
26 32 #include <linux/ioport.h>
27   -#include <asm/io.h>
28   -
29   -extern void __ide_mm_insw(void __iomem *port, void *addr, u32 count);
30   -extern void __ide_mm_outsw(void __iomem *port, void *addr, u32 count);
31   -extern void __ide_mm_insl(void __iomem *port, void *addr, u32 count);
32   -extern void __ide_mm_outsl(void __iomem *port, void *addr, u32 count);
33 33  
34 34 struct ide_machdep_calls {
35 35 int (*default_irq)(unsigned long base);
include/asm-powerpc/io.h
Diff comments   View file @ 73ea9e1
... ... @@ -28,12 +28,6 @@
28 28  
29 29 #include <asm-generic/iomap.h>
30 30  
31   -#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c))
32   -#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c))
33   -#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c))
34   -#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c))
35   -
36   -
37 31 #define SIO_CONFIG_RA 0x398
38 32 #define SIO_CONFIG_RD 0x399
39 33