Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
m68k: Prefix ISA type with ISA_TYPE_
The *_ISA type defines are quite generic and cause namespace conflicts
(e.g. with `AMIGAHW_DECLARE(GG2_ISA)' in <asm/amigahw.h>) for some kernel
configurations. Use ISA_TYPE_* to avoid such conflicts.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Geert Uytterhoeven
and committed by
Linus Torvalds
52de114e
91cf2483
+25
-25
+3
-3
arch/m68k/kernel/setup.c
+3
-3
arch/m68k/kernel/setup.c
···
348
348
#if defined(CONFIG_ISA) && defined(MULTI_ISA)
349
349
#if defined(CONFIG_Q40)
350
350
if (MACH_IS_Q40) {
351
-
isa_type = Q40_ISA;
351
+
isa_type = ISA_TYPE_Q40;
352
352
isa_sex = 0;
353
353
}
354
354
#elif defined(CONFIG_GG2)
355
355
if (MACH_IS_AMIGA && AMIGAHW_PRESENT(GG2_ISA)) {
356
-
isa_type = GG2_ISA;
356
+
isa_type = ISA_TYPE_GG2;
357
357
isa_sex = 0;
358
358
}
359
359
#elif defined(CONFIG_AMIGA_PCMCIA)
360
360
if (MACH_IS_AMIGA && AMIGAHW_PRESENT(PCMCIA)) {
361
-
isa_type = AG_ISA;
361
+
isa_type = ISA_TYPE_AG;
362
362
isa_sex = 1;
363
363
}
364
364
#endif
+22
-22
include/asm-m68k/io.h
+22
-22
include/asm-m68k/io.h
···
91
91
#undef MULTI_ISA
92
92
#endif
93
93
94
-
#define Q40_ISA (1)
95
-
#define GG2_ISA (2)
96
-
#define AG_ISA (3)
94
+
#define ISA_TYPE_Q40 (1)
95
+
#define ISA_TYPE_GG2 (2)
96
+
#define ISA_TYPE_AG (3)
97
97
98
98
#if defined(CONFIG_Q40) && !defined(MULTI_ISA)
99
-
#define ISA_TYPE Q40_ISA
99
+
#define ISA_TYPE ISA_TYPE_Q40
100
100
#define ISA_SEX 0
101
101
#endif
102
102
#if defined(CONFIG_AMIGA_PCMCIA) && !defined(MULTI_ISA)
103
-
#define ISA_TYPE AG_ISA
103
+
#define ISA_TYPE ISA_TYPE_AG
104
104
#define ISA_SEX 1
105
105
#endif
106
106
#if defined(CONFIG_GG2) && !defined(MULTI_ISA)
107
-
#define ISA_TYPE GG2_ISA
107
+
#define ISA_TYPE ISA_TYPE_GG2
108
108
#define ISA_SEX 0
109
109
#endif
110
110
···
126
126
switch(ISA_TYPE)
127
127
{
128
128
#ifdef CONFIG_Q40
129
-
case Q40_ISA: return (u8 __iomem *)Q40_ISA_IO_B(addr);
129
+
case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_IO_B(addr);
130
130
#endif
131
131
#ifdef CONFIG_GG2
132
-
case GG2_ISA: return (u8 __iomem *)GG2_ISA_IO_B(addr);
132
+
case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_IO_B(addr);
133
133
#endif
134
134
#ifdef CONFIG_AMIGA_PCMCIA
135
-
case AG_ISA: return (u8 __iomem *)AG_ISA_IO_B(addr);
135
+
case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr);
136
136
#endif
137
137
default: return NULL; /* avoid warnings, just in case */
138
138
}
···
142
142
switch(ISA_TYPE)
143
143
{
144
144
#ifdef CONFIG_Q40
145
-
case Q40_ISA: return (u16 __iomem *)Q40_ISA_IO_W(addr);
145
+
case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_IO_W(addr);
146
146
#endif
147
147
#ifdef CONFIG_GG2
148
-
case GG2_ISA: return (u16 __iomem *)GG2_ISA_IO_W(addr);
148
+
case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_IO_W(addr);
149
149
#endif
150
150
#ifdef CONFIG_AMIGA_PCMCIA
151
-
case AG_ISA: return (u16 __iomem *)AG_ISA_IO_W(addr);
151
+
case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr);
152
152
#endif
153
153
default: return NULL; /* avoid warnings, just in case */
154
154
}
···
158
158
switch(ISA_TYPE)
159
159
{
160
160
#ifdef CONFIG_AMIGA_PCMCIA
161
-
case AG_ISA: return (u32 __iomem *)AG_ISA_IO_W(addr);
161
+
case ISA_TYPE_AG: return (u32 __iomem *)AG_ISA_IO_W(addr);
162
162
#endif
163
163
default: return 0; /* avoid warnings, just in case */
164
164
}
···
168
168
switch(ISA_TYPE)
169
169
{
170
170
#ifdef CONFIG_Q40
171
-
case Q40_ISA: return (u8 __iomem *)Q40_ISA_MEM_B(addr);
171
+
case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_MEM_B(addr);
172
172
#endif
173
173
#ifdef CONFIG_GG2
174
-
case GG2_ISA: return (u8 __iomem *)GG2_ISA_MEM_B(addr);
174
+
case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_MEM_B(addr);
175
175
#endif
176
176
#ifdef CONFIG_AMIGA_PCMCIA
177
-
case AG_ISA: return (u8 __iomem *)addr;
177
+
case ISA_TYPE_AG: return (u8 __iomem *)addr;
178
178
#endif
179
179
default: return NULL; /* avoid warnings, just in case */
180
180
}
···
184
184
switch(ISA_TYPE)
185
185
{
186
186
#ifdef CONFIG_Q40
187
-
case Q40_ISA: return (u16 __iomem *)Q40_ISA_MEM_W(addr);
187
+
case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_MEM_W(addr);
188
188
#endif
189
189
#ifdef CONFIG_GG2
190
-
case GG2_ISA: return (u16 __iomem *)GG2_ISA_MEM_W(addr);
190
+
case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_MEM_W(addr);
191
191
#endif
192
192
#ifdef CONFIG_AMIGA_PCMCIA
193
-
case AG_ISA: return (u16 __iomem *)addr;
193
+
case ISA_TYPE_AG: return (u16 __iomem *)addr;
194
194
#endif
195
195
default: return NULL; /* avoid warnings, just in case */
196
196
}
···
218
218
switch(ISA_TYPE)
219
219
{
220
220
#ifdef CONFIG_Q40
221
-
case Q40_ISA: isa_outb(0,0x80); break;
221
+
case ISA_TYPE_Q40: isa_outb(0,0x80); break;
222
222
#endif
223
223
#ifdef CONFIG_GG2
224
-
case GG2_ISA: break;
224
+
case ISA_TYPE_GG2: break;
225
225
#endif
226
226
#ifdef CONFIG_AMIGA_PCMCIA
227
-
case AG_ISA: break;
227
+
case ISA_TYPE_AG: break;
228
228
#endif
229
229
default: break; /* avoid warnings */
230
230
}