@@ -229,13 +229,13 @@ unsigned long logic_pio_trans_cpuaddr(resource_size_t addr)
229
229
}
230
230
231
231
#if defined(CONFIG_INDIRECT_PIO ) && defined(PCI_IOBASE )
232
- #define BUILD_LOGIC_IO (bw , type ) \
233
- type logic_in##bw (unsigned long addr) \
232
+ #define BUILD_LOGIC_IO (bwl , type ) \
233
+ type logic_in##bwl (unsigned long addr) \
234
234
{ \
235
235
type ret = (type)~0; \
236
236
\
237
237
if (addr < MMIO_UPPER_LIMIT) { \
238
- ret = read##bw (PCI_IOBASE + addr); \
238
+ ret = read##bwl (PCI_IOBASE + addr); \
239
239
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
240
240
struct logic_pio_hwaddr *entry = find_io_range(addr); \
241
241
\
@@ -248,10 +248,10 @@ type logic_in##bw(unsigned long addr) \
248
248
return ret; \
249
249
} \
250
250
\
251
- void logic_out##bw (type value, unsigned long addr) \
251
+ void logic_out##bwl (type value, unsigned long addr) \
252
252
{ \
253
253
if (addr < MMIO_UPPER_LIMIT) { \
254
- write##bw (value, PCI_IOBASE + addr); \
254
+ write##bwl (value, PCI_IOBASE + addr); \
255
255
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
256
256
struct logic_pio_hwaddr *entry = find_io_range(addr); \
257
257
\
@@ -263,11 +263,11 @@ void logic_out##bw(type value, unsigned long addr) \
263
263
} \
264
264
} \
265
265
\
266
- void logic_ins##bw (unsigned long addr, void *buffer, \
267
- unsigned int count) \
266
+ void logic_ins##bwl (unsigned long addr, void *buffer, \
267
+ unsigned int count) \
268
268
{ \
269
269
if (addr < MMIO_UPPER_LIMIT) { \
270
- reads##bw (PCI_IOBASE + addr, buffer, count); \
270
+ reads##bwl (PCI_IOBASE + addr, buffer, count); \
271
271
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
272
272
struct logic_pio_hwaddr *entry = find_io_range(addr); \
273
273
\
@@ -280,11 +280,11 @@ void logic_ins##bw(unsigned long addr, void *buffer, \
280
280
\
281
281
} \
282
282
\
283
- void logic_outs##bw (unsigned long addr, const void *buffer, \
284
- unsigned int count) \
283
+ void logic_outs##bwl (unsigned long addr, const void *buffer, \
284
+ unsigned int count) \
285
285
{ \
286
286
if (addr < MMIO_UPPER_LIMIT) { \
287
- writes##bw (PCI_IOBASE + addr, buffer, count); \
287
+ writes##bwl (PCI_IOBASE + addr, buffer, count); \
288
288
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
289
289
struct logic_pio_hwaddr *entry = find_io_range(addr); \
290
290
\
0 commit comments