Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[linux-2.6-microblaze.git] / lib / logic_pio.c

diff --git a/lib/logic_pio.c b/lib/logic_pio.c
index f511a99..f32fe48 100644 (file)
--- a/lib/logic_pio.c
+++ b/lib/logic_pio.c
@@ -229,13 +229,13 @@ unsigned long logic_pio_trans_cpuaddr(resource_size_t addr)
 }
 
 #if defined(CONFIG_INDIRECT_PIO) && defined(PCI_IOBASE)
-#define BUILD_LOGIC_IO(bw, type)                                       \
-type logic_in##bw(unsigned long addr)                                  \
+#define BUILD_LOGIC_IO(bwl, type)                                      \
+type logic_in##bwl(unsigned long addr)                                 \
 {                                                                      \
        type ret = (type)~0;                                            \
                                                                        \
        if (addr < MMIO_UPPER_LIMIT) {                                  \
-               ret = read##bw(PCI_IOBASE + addr);                      \
+               ret = _in##bwl(addr);                                   \
        } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
                struct logic_pio_hwaddr *entry = find_io_range(addr);   \
                                                                        \
@@ -248,10 +248,10 @@ type logic_in##bw(unsigned long addr)                                     \
        return ret;                                                     \
 }                                                                      \
                                                                        \
-void logic_out##bw(type value, unsigned long addr)                     \
+void logic_out##bwl(type value, unsigned long addr)                    \
 {                                                                      \
        if (addr < MMIO_UPPER_LIMIT) {                                  \
-               write##bw(value, PCI_IOBASE + addr);                    \
+               _out##bwl(value, addr);                         \
        } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
                struct logic_pio_hwaddr *entry = find_io_range(addr);   \
                                                                        \
@@ -263,11 +263,11 @@ void logic_out##bw(type value, unsigned long addr)                        \
        }                                                               \
 }                                                                      \
                                                                        \
-void logic_ins##bw(unsigned long addr, void *buffer,                   \
-                  unsigned int count)                                  \
+void logic_ins##bwl(unsigned long addr, void *buffer,                  \
+                   unsigned int count)                                 \
 {                                                                      \
        if (addr < MMIO_UPPER_LIMIT) {                                  \
-               reads##bw(PCI_IOBASE + addr, buffer, count);            \
+               reads##bwl(PCI_IOBASE + addr, buffer, count);           \
        } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
                struct logic_pio_hwaddr *entry = find_io_range(addr);   \
                                                                        \
@@ -280,11 +280,11 @@ void logic_ins##bw(unsigned long addr, void *buffer,                      \
                                                                        \
 }                                                                      \
                                                                        \
-void logic_outs##bw(unsigned long addr, const void *buffer,            \
-                   unsigned int count)                                 \
+void logic_outs##bwl(unsigned long addr, const void *buffer,           \
+                    unsigned int count)                                \
 {                                                                      \
        if (addr < MMIO_UPPER_LIMIT) {                                  \
-               writes##bw(PCI_IOBASE + addr, buffer, count);           \
+               writes##bwl(PCI_IOBASE + addr, buffer, count);          \
        } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
                struct logic_pio_hwaddr *entry = find_io_range(addr);   \
                                                                        \