Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a41d3862dfd44a1b09a0f6243bb34773061fd9a2

Authored by Helge Deller
Committed by Kyle McMartin
1 parent cb4ab59cd6
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

[PARISC] Remove obsolete CONFIG_DEBUG_IOREMAP 

Remove CONFIG_DEBUG_IOREMAP, it's now obsolete and won't work anyway.
Remove it from lib/KConfig since it was only available on parisc.

Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

Showing 4 changed files with 0 additions and 74 deletions Side-by-side Diff

arch/parisc/lib/iomap.c
Diff comments   View file @ a41d386
... ... @@ -263,11 +263,7 @@
263 263  
264 264 const struct iomap_ops *iomap_ops[8] = {
265 265 [0] = &ioport_ops,
266   -#ifdef CONFIG_DEBUG_IOREMAP
267   - [6] = &iomem_ops,
268   -#else
269 266 [7] = &iomem_ops
270   -#endif
271 267 };
272 268  
273 269  
arch/parisc/mm/ioremap.c
Diff comments   View file @ a41d386
... ... @@ -114,30 +114,6 @@
114 114 return error;
115 115 }
116 116  
117   -#ifdef CONFIG_DEBUG_IOREMAP
118   -static unsigned long last = 0;
119   -
120   -void gsc_bad_addr(unsigned long addr)
121   -{
122   - if (time_after(jiffies, last + HZ*10)) {
123   - printk("gsc_foo() called with bad address 0x%lx\n", addr);
124   - dump_stack();
125   - last = jiffies;
126   - }
127   -}
128   -EXPORT_SYMBOL(gsc_bad_addr);
129   -
130   -void __raw_bad_addr(const volatile void __iomem *addr)
131   -{
132   - if (time_after(jiffies, last + HZ*10)) {
133   - printk("__raw_foo() called with bad address 0x%p\n", addr);
134   - dump_stack();
135   - last = jiffies;
136   - }
137   -}
138   -EXPORT_SYMBOL(__raw_bad_addr);
139   -#endif
140   -
141 117 /*
142 118 * Generic mapping function (not visible outside):
143 119 */
include/asm-parisc/io.h
Diff comments   View file @ a41d386
... ... @@ -25,31 +25,11 @@
25 25 * eg dev->hpa or 0xfee00000.
26 26 */
27 27  
28   -#ifdef CONFIG_DEBUG_IOREMAP
29   -#define NYBBLE_SHIFT (BITS_PER_LONG - 4)
30   -extern void gsc_bad_addr(unsigned long addr);
31   -extern void __raw_bad_addr(const volatile void __iomem *addr);
32   -#define gsc_check_addr(addr) \
33   - if ((addr >> NYBBLE_SHIFT) != 0xf) { \
34   - gsc_bad_addr(addr); \
35   - addr |= 0xfUL << NYBBLE_SHIFT; \
36   - }
37   -#define __raw_check_addr(addr) \
38   - if (((unsigned long)addr >> NYBBLE_SHIFT) != 0xe) \
39   - __raw_bad_addr(addr); \
40   - addr = (void __iomem *)((unsigned long)addr | (0xfUL << NYBBLE_SHIFT));
41   -#else
42   -#define gsc_check_addr(addr)
43   -#define __raw_check_addr(addr)
44   -#endif
45   -
46 28 static inline unsigned char gsc_readb(unsigned long addr)
47 29 {
48 30 long flags;
49 31 unsigned char ret;
50 32  
51   - gsc_check_addr(addr);
52   -
53 33 __asm__ __volatile__(
54 34 " rsm 2,%0\n"
55 35 " ldbx 0(%2),%1\n"
... ... @@ -64,8 +44,6 @@
64 44 long flags;
65 45 unsigned short ret;
66 46  
67   - gsc_check_addr(addr);
68   -
69 47 __asm__ __volatile__(
70 48 " rsm 2,%0\n"
71 49 " ldhx 0(%2),%1\n"
... ... @@ -79,8 +57,6 @@
79 57 {
80 58 u32 ret;
81 59  
82   - gsc_check_addr(addr);
83   -
84 60 __asm__ __volatile__(
85 61 " ldwax 0(%1),%0\n"
86 62 : "=r" (ret) : "r" (addr) );
... ... @@ -91,7 +67,6 @@
91 67 static inline unsigned long long gsc_readq(unsigned long addr)
92 68 {
93 69 unsigned long long ret;
94   - gsc_check_addr(addr);
95 70  
96 71 #ifdef __LP64__
97 72 __asm__ __volatile__(
... ... @@ -108,8 +83,6 @@
108 83 static inline void gsc_writeb(unsigned char val, unsigned long addr)
109 84 {
110 85 long flags;
111   - gsc_check_addr(addr);
112   -
113 86 __asm__ __volatile__(
114 87 " rsm 2,%0\n"
115 88 " stbs %1,0(%2)\n"
... ... @@ -120,8 +93,6 @@
120 93 static inline void gsc_writew(unsigned short val, unsigned long addr)
121 94 {
122 95 long flags;
123   - gsc_check_addr(addr);
124   -
125 96 __asm__ __volatile__(
126 97 " rsm 2,%0\n"
127 98 " sths %1,0(%2)\n"
... ... @@ -131,8 +102,6 @@
131 102  
132 103 static inline void gsc_writel(unsigned int val, unsigned long addr)
133 104 {
134   - gsc_check_addr(addr);
135   -
136 105 __asm__ __volatile__(
137 106 " stwas %0,0(%1)\n"
138 107 : : "r" (val), "r" (addr) );
... ... @@ -140,8 +109,6 @@
140 109  
141 110 static inline void gsc_writeq(unsigned long long val, unsigned long addr)
142 111 {
143   - gsc_check_addr(addr);
144   -
145 112 #ifdef __LP64__
146 113 __asm__ __volatile__(
147 114 " stda %0,0(%1)\n"
... ... @@ -157,19 +157,6 @@
157 157  
158 158 If unsure, say N.
159 159  
160   -config DEBUG_IOREMAP
161   - bool "Enable ioremap() debugging"
162   - depends on DEBUG_KERNEL && PARISC
163   - help
164   - Enabling this option will cause the kernel to distinguish between
165   - ioremapped and physical addresses. It will print a backtrace (at
166   - most one every 10 seconds), hopefully allowing you to see which
167   - drivers need work. Fixing all these problems is a prerequisite
168   - for turning on USE_HPPA_IOREMAP. The warnings are harmless;
169   - the kernel has enough information to fix the broken drivers
170   - automatically, but we'd like to make it more efficient by not
171   - having to do that.
172   -
173 160 config DEBUG_FS
174 161 bool "Debug Filesystem"
175 162 depends on SYSFS