hc
2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb
kernel/arch/m68k/include/asm/io_no.h
....@@ -14,15 +14,15 @@
1414 * that behavior here first before we include asm-generic/io.h.
1515 */
1616 #define __raw_readb(addr) \
17
- ({ unsigned char __v = (*(volatile unsigned char *) (addr)); __v; })
17
+ ({ u8 __v = (*(__force volatile u8 *) (addr)); __v; })
1818 #define __raw_readw(addr) \
19
- ({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; })
19
+ ({ u16 __v = (*(__force volatile u16 *) (addr)); __v; })
2020 #define __raw_readl(addr) \
21
- ({ unsigned int __v = (*(volatile unsigned int *) (addr)); __v; })
21
+ ({ u32 __v = (*(__force volatile u32 *) (addr)); __v; })
2222
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))
2626
2727 #if defined(CONFIG_COLDFIRE)
2828 /*
....@@ -67,7 +67,7 @@
6767 {
6868 if (cf_internalio(addr))
6969 return __raw_readw(addr);
70
- return __le16_to_cpu(__raw_readw(addr));
70
+ return swab16(__raw_readw(addr));
7171 }
7272
7373 #define readl readl
....@@ -75,7 +75,7 @@
7575 {
7676 if (cf_internalio(addr))
7777 return __raw_readl(addr);
78
- return __le32_to_cpu(__raw_readl(addr));
78
+ return swab32(__raw_readl(addr));
7979 }
8080
8181 #define writew writew
....@@ -84,7 +84,7 @@
8484 if (cf_internalio(addr))
8585 __raw_writew(value, addr);
8686 else
87
- __raw_writew(__cpu_to_le16(value), addr);
87
+ __raw_writew(swab16(value), addr);
8888 }
8989
9090 #define writel writel
....@@ -93,7 +93,7 @@
9393 if (cf_internalio(addr))
9494 __raw_writel(value, addr);
9595 else
96
- __raw_writel(__cpu_to_le32(value), addr);
96
+ __raw_writel(swab32(value), addr);
9797 }
9898
9999 #else