|
@@ -225,15 +225,15 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
|
|
|
#ifndef CONFIG_GENERIC_IOMAP
|
|
|
#define ioread8(addr) readb(addr)
|
|
|
#define ioread16(addr) readw(addr)
|
|
|
-#define ioread16be(addr) be16_to_cpu(ioread16(addr))
|
|
|
+#define ioread16be(addr) __be16_to_cpu(__raw_readw(addr))
|
|
|
#define ioread32(addr) readl(addr)
|
|
|
-#define ioread32be(addr) be32_to_cpu(ioread32(addr))
|
|
|
+#define ioread32be(addr) __be32_to_cpu(__raw_readl(addr))
|
|
|
|
|
|
#define iowrite8(v, addr) writeb((v), (addr))
|
|
|
#define iowrite16(v, addr) writew((v), (addr))
|
|
|
-#define iowrite16be(v, addr) iowrite16(be16_to_cpu(v), (addr))
|
|
|
+#define iowrite16be(v, addr) __raw_writew(__cpu_to_be16(v), addr)
|
|
|
#define iowrite32(v, addr) writel((v), (addr))
|
|
|
-#define iowrite32be(v, addr) iowrite32(be32_to_cpu(v), (addr))
|
|
|
+#define iowrite32be(v, addr) __raw_writel(__cpu_to_be32(v), addr)
|
|
|
|
|
|
#define ioread8_rep(p, dst, count) \
|
|
|
insb((unsigned long) (p), (dst), (count))
|