.. | .. |
---|
14 | 14 | * that behavior here first before we include asm-generic/io.h. |
---|
15 | 15 | */ |
---|
16 | 16 | #define __raw_readb(addr) \ |
---|
17 | | - ({ unsigned char __v = (*(volatile unsigned char *) (addr)); __v; }) |
---|
| 17 | + ({ u8 __v = (*(__force volatile u8 *) (addr)); __v; }) |
---|
18 | 18 | #define __raw_readw(addr) \ |
---|
19 | | - ({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; }) |
---|
| 19 | + ({ u16 __v = (*(__force volatile u16 *) (addr)); __v; }) |
---|
20 | 20 | #define __raw_readl(addr) \ |
---|
21 | | - ({ unsigned int __v = (*(volatile unsigned int *) (addr)); __v; }) |
---|
| 21 | + ({ u32 __v = (*(__force volatile u32 *) (addr)); __v; }) |
---|
22 | 22 | |
---|
23 | | -#define __raw_writeb(b, addr) (void)((*(volatile unsigned char *) (addr)) = (b)) |
---|
24 | | -#define __raw_writew(b, addr) (void)((*(volatile unsigned short *) (addr)) = (b)) |
---|
25 | | -#define __raw_writel(b, addr) (void)((*(volatile unsigned int *) (addr)) = (b)) |
---|
| 23 | +#define __raw_writeb(b, addr) (void)((*(__force volatile u8 *) (addr)) = (b)) |
---|
| 24 | +#define __raw_writew(b, addr) (void)((*(__force volatile u16 *) (addr)) = (b)) |
---|
| 25 | +#define __raw_writel(b, addr) (void)((*(__force volatile u32 *) (addr)) = (b)) |
---|
26 | 26 | |
---|
27 | 27 | #if defined(CONFIG_COLDFIRE) |
---|
28 | 28 | /* |
---|
.. | .. |
---|
67 | 67 | { |
---|
68 | 68 | if (cf_internalio(addr)) |
---|
69 | 69 | return __raw_readw(addr); |
---|
70 | | - return __le16_to_cpu(__raw_readw(addr)); |
---|
| 70 | + return swab16(__raw_readw(addr)); |
---|
71 | 71 | } |
---|
72 | 72 | |
---|
73 | 73 | #define readl readl |
---|
.. | .. |
---|
75 | 75 | { |
---|
76 | 76 | if (cf_internalio(addr)) |
---|
77 | 77 | return __raw_readl(addr); |
---|
78 | | - return __le32_to_cpu(__raw_readl(addr)); |
---|
| 78 | + return swab32(__raw_readl(addr)); |
---|
79 | 79 | } |
---|
80 | 80 | |
---|
81 | 81 | #define writew writew |
---|
.. | .. |
---|
84 | 84 | if (cf_internalio(addr)) |
---|
85 | 85 | __raw_writew(value, addr); |
---|
86 | 86 | else |
---|
87 | | - __raw_writew(__cpu_to_le16(value), addr); |
---|
| 87 | + __raw_writew(swab16(value), addr); |
---|
88 | 88 | } |
---|
89 | 89 | |
---|
90 | 90 | #define writel writel |
---|
.. | .. |
---|
93 | 93 | if (cf_internalio(addr)) |
---|
94 | 94 | __raw_writel(value, addr); |
---|
95 | 95 | else |
---|
96 | | - __raw_writel(__cpu_to_le32(value), addr); |
---|
| 96 | + __raw_writel(swab32(value), addr); |
---|
97 | 97 | } |
---|
98 | 98 | |
---|
99 | 99 | #else |
---|