Skip to content

Commit 26c4c6c

Browse files
John Garryjoyxu
authored andcommitted
logic_pio: Improve macro argument name
Macro argument "bw" is used for building byte, word, and long-based functions. Use "bwl" instead, to include long. Reviewed-by: Arnd Bergmann <[email protected]> Signed-off-by: John Garry <[email protected]> Signed-off-by: Wei Xu <[email protected]>
1 parent f009c89 commit 26c4c6c

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

lib/logic_pio.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,13 @@ unsigned long logic_pio_trans_cpuaddr(resource_size_t addr)
229229
}
230230

231231
#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) \
234234
{ \
235235
type ret = (type)~0; \
236236
\
237237
if (addr < MMIO_UPPER_LIMIT) { \
238-
ret = read##bw(PCI_IOBASE + addr); \
238+
ret = read##bwl(PCI_IOBASE + addr); \
239239
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
240240
struct logic_pio_hwaddr *entry = find_io_range(addr); \
241241
\
@@ -248,10 +248,10 @@ type logic_in##bw(unsigned long addr) \
248248
return ret; \
249249
} \
250250
\
251-
void logic_out##bw(type value, unsigned long addr) \
251+
void logic_out##bwl(type value, unsigned long addr) \
252252
{ \
253253
if (addr < MMIO_UPPER_LIMIT) { \
254-
write##bw(value, PCI_IOBASE + addr); \
254+
write##bwl(value, PCI_IOBASE + addr); \
255255
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
256256
struct logic_pio_hwaddr *entry = find_io_range(addr); \
257257
\
@@ -263,11 +263,11 @@ void logic_out##bw(type value, unsigned long addr) \
263263
} \
264264
} \
265265
\
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) \
268268
{ \
269269
if (addr < MMIO_UPPER_LIMIT) { \
270-
reads##bw(PCI_IOBASE + addr, buffer, count); \
270+
reads##bwl(PCI_IOBASE + addr, buffer, count); \
271271
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
272272
struct logic_pio_hwaddr *entry = find_io_range(addr); \
273273
\
@@ -280,11 +280,11 @@ void logic_ins##bw(unsigned long addr, void *buffer, \
280280
\
281281
} \
282282
\
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) \
285285
{ \
286286
if (addr < MMIO_UPPER_LIMIT) { \
287-
writes##bw(PCI_IOBASE + addr, buffer, count); \
287+
writes##bwl(PCI_IOBASE + addr, buffer, count); \
288288
} else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
289289
struct logic_pio_hwaddr *entry = find_io_range(addr); \
290290
\

0 commit comments

Comments
 (0)