|
@@ -19,9 +19,9 @@
|
|
|
#define IOMAP_NOCACHE_NONSER 2
|
|
|
#define IOMAP_WRITETHROUGH 3
|
|
|
|
|
|
-extern void iounmap(void *addr);
|
|
|
+extern void iounmap(void __iomem *addr);
|
|
|
|
|
|
-extern void *__ioremap(unsigned long physaddr, unsigned long size,
|
|
|
+extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size,
|
|
|
int cacheflag);
|
|
|
extern void __iounmap(void *addr, unsigned long size);
|
|
|
|
|
@@ -30,21 +30,21 @@ extern void __iounmap(void *addr, unsigned long size);
|
|
|
* two accesses to memory, which may be undesirable for some devices.
|
|
|
*/
|
|
|
#define in_8(addr) \
|
|
|
- ({ u8 __v = (*(volatile u8 *) (addr)); __v; })
|
|
|
+ ({ u8 __v = (*(__force volatile u8 *) (addr)); __v; })
|
|
|
#define in_be16(addr) \
|
|
|
- ({ u16 __v = (*(volatile u16 *) (addr)); __v; })
|
|
|
+ ({ u16 __v = (*(__force volatile u16 *) (addr)); __v; })
|
|
|
#define in_be32(addr) \
|
|
|
- ({ u32 __v = (*(volatile u32 *) (addr)); __v; })
|
|
|
+ ({ u32 __v = (*(__force volatile u32 *) (addr)); __v; })
|
|
|
#define in_le16(addr) \
|
|
|
- ({ u16 __v = le16_to_cpu(*(volatile u16 *) (addr)); __v; })
|
|
|
+ ({ u16 __v = le16_to_cpu(*(__force volatile u16 *) (addr)); __v; })
|
|
|
#define in_le32(addr) \
|
|
|
- ({ u32 __v = le32_to_cpu(*(volatile u32 *) (addr)); __v; })
|
|
|
+ ({ u32 __v = le32_to_cpu(*(__force volatile u32 *) (addr)); __v; })
|
|
|
|
|
|
-#define out_8(addr,b) (void)((*(volatile u8 *) (addr)) = (b))
|
|
|
-#define out_be16(addr,w) (void)((*(volatile u16 *) (addr)) = (w))
|
|
|
-#define out_be32(addr,l) (void)((*(volatile u32 *) (addr)) = (l))
|
|
|
-#define out_le16(addr,w) (void)((*(volatile u16 *) (addr)) = cpu_to_le16(w))
|
|
|
-#define out_le32(addr,l) (void)((*(volatile u32 *) (addr)) = cpu_to_le32(l))
|
|
|
+#define out_8(addr,b) (void)((*(__force volatile u8 *) (addr)) = (b))
|
|
|
+#define out_be16(addr,w) (void)((*(__force volatile u16 *) (addr)) = (w))
|
|
|
+#define out_be32(addr,l) (void)((*(__force volatile u32 *) (addr)) = (l))
|
|
|
+#define out_le16(addr,w) (void)((*(__force volatile u16 *) (addr)) = cpu_to_le16(w))
|
|
|
+#define out_le32(addr,l) (void)((*(__force volatile u32 *) (addr)) = cpu_to_le32(l))
|
|
|
|
|
|
#define raw_inb in_8
|
|
|
#define raw_inw in_be16
|
|
@@ -54,7 +54,7 @@ extern void __iounmap(void *addr, unsigned long size);
|
|
|
#define raw_outw(val,port) out_be16((port),(val))
|
|
|
#define raw_outl(val,port) out_be32((port),(val))
|
|
|
|
|
|
-static inline void raw_insb(volatile u8 *port, u8 *buf, unsigned int len)
|
|
|
+static inline void raw_insb(volatile u8 __iomem *port, u8 *buf, unsigned int len)
|
|
|
{
|
|
|
unsigned int i;
|
|
|
|
|
@@ -62,7 +62,7 @@ static inline void raw_insb(volatile u8 *port, u8 *buf, unsigned int len)
|
|
|
*buf++ = in_8(port);
|
|
|
}
|
|
|
|
|
|
-static inline void raw_outsb(volatile u8 *port, const u8 *buf,
|
|
|
+static inline void raw_outsb(volatile u8 __iomem *port, const u8 *buf,
|
|
|
unsigned int len)
|
|
|
{
|
|
|
unsigned int i;
|
|
@@ -71,7 +71,7 @@ static inline void raw_outsb(volatile u8 *port, const u8 *buf,
|
|
|
out_8(port, *buf++);
|
|
|
}
|
|
|
|
|
|
-static inline void raw_insw(volatile u16 *port, u16 *buf, unsigned int nr)
|
|
|
+static inline void raw_insw(volatile u16 __iomem *port, u16 *buf, unsigned int nr)
|
|
|
{
|
|
|
unsigned int tmp;
|
|
|
|
|
@@ -110,7 +110,7 @@ static inline void raw_insw(volatile u16 *port, u16 *buf, unsigned int nr)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static inline void raw_outsw(volatile u16 *port, const u16 *buf,
|
|
|
+static inline void raw_outsw(volatile u16 __iomem *port, const u16 *buf,
|
|
|
unsigned int nr)
|
|
|
{
|
|
|
unsigned int tmp;
|
|
@@ -150,7 +150,7 @@ static inline void raw_outsw(volatile u16 *port, const u16 *buf,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static inline void raw_insl(volatile u32 *port, u32 *buf, unsigned int nr)
|
|
|
+static inline void raw_insl(volatile u32 __iomem *port, u32 *buf, unsigned int nr)
|
|
|
{
|
|
|
unsigned int tmp;
|
|
|
|
|
@@ -189,7 +189,7 @@ static inline void raw_insl(volatile u32 *port, u32 *buf, unsigned int nr)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static inline void raw_outsl(volatile u32 *port, const u32 *buf,
|
|
|
+static inline void raw_outsl(volatile u32 __iomem *port, const u32 *buf,
|
|
|
unsigned int nr)
|
|
|
{
|
|
|
unsigned int tmp;
|
|
@@ -230,7 +230,7 @@ static inline void raw_outsl(volatile u32 *port, const u32 *buf,
|
|
|
}
|
|
|
|
|
|
|
|
|
-static inline void raw_insw_swapw(volatile u16 *port, u16 *buf,
|
|
|
+static inline void raw_insw_swapw(volatile u16 __iomem *port, u16 *buf,
|
|
|
unsigned int nr)
|
|
|
{
|
|
|
if ((nr) % 8)
|
|
@@ -283,7 +283,7 @@ static inline void raw_insw_swapw(volatile u16 *port, u16 *buf,
|
|
|
: "d0", "a0", "a1", "d6");
|
|
|
}
|
|
|
|
|
|
-static inline void raw_outsw_swapw(volatile u16 *port, const u16 *buf,
|
|
|
+static inline void raw_outsw_swapw(volatile u16 __iomem *port, const u16 *buf,
|
|
|
unsigned int nr)
|
|
|
{
|
|
|
if ((nr) % 8)
|