m68k: basic iomem annotations
PATCH 21/36 m68k: basic iomem annotations
From: Al Viro <[email protected]>
Date: 1133512630 -0500
Signed-off-by Al Viro <[email protected]>
---
arch/m68k/mm/kmap.c | 12 ++++++----- include/asm-m68k/io.h | 49 +++++++++++++++++++++++---------------------- include/asm-m68k/raw_io.h | 40 ++++++++++++++++++------------------- include/asm-m68k/zorro.h | 8 ++++--- 4 files changed, 55 insertions(+), 54 deletions(-)
1e91f0f0ade38fc27e22929dc2bd34af1908d098
arch/m68k/mm/kmap.c +6 -6
@@ -102,7 +102,7 @@ static inline void free_io_area(void *ad*/ /* Rewritten by Andreas Schwab to remove all races. */ -void *__ioremap (unsigned long physaddr,unsigned long size,int cacheflag) +void __iomem *__ioremap (unsigned long physaddr,unsigned long size,int cacheflag) {struct vm_struct *area;unsigned long virtaddr, retaddr;
@@ -121,7 +121,7 @@ void *__ioremap(unsigned long physaddr,if (MACH_IS_AMIGA ) {if ((physaddr >=0x40000000 ) && (physaddr + size <0x60000000 ) && (cacheflag ==IOMAP_NOCACHE_SER )) -return (void *)physaddr; +return (void __iomem *)physaddr; }#endif
@@ -218,21 +218,21 @@ void *__ioremap(unsigned long physaddr,#endif flush_tlb_all (); -return (void *)retaddr; +return (void __iomem *)retaddr; }/* * Unmap a ioremap()ed region again */ -void iounmap (void *addr) +void iounmap (void __iomem *addr) {#ifdef CONFIG_AMIGA if ((!MACH_IS_AMIGA ) || (((unsigned long )addr <0x40000000 ) || ((unsigned long )addr >0x60000000 ))) -free_io_area (addr); +free_io_area ((__force void *)addr);#else -free_io_area (addr); +free_io_area ((__force void *)addr);#endif }
include/asm-m68k/io.h +25 -24
119 lines not on this page · raw message
include/asm-m68k/raw_io.h +20 -20
@@ -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, unsign* 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, unsign#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 *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 u8out_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 } } -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 u1 } } -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 } } -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 u3 } -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(volati : "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 )
include/asm-m68k/zorro.h +4 -4
@@ -15,24 +15,24 @@#define z_memcpy_fromio (a,b,c) memcpy((a),(void *)(b),(c))#define z_memcpy_toio (a,b,c) memcpy((void *)(a),(b),(c)) -static inline void *z_remap_nocache_ser (unsigned long physaddr, +static inline void __iomem *z_remap_nocache_ser (unsigned long physaddr,unsigned long size) {return __ioremap (physaddr, size,IOMAP_NOCACHE_SER ); } -static inline void *z_remap_nocache_nonser (unsigned long physaddr, +static inline void __iomem *z_remap_nocache_nonser (unsigned long physaddr,unsigned long size) {return __ioremap (physaddr, size,IOMAP_NOCACHE_NONSER ); } -static inline void *z_remap_writethrough (unsigned long physaddr, +static inline void __iomem *z_remap_writethrough (unsigned long physaddr,unsigned long size) {return __ioremap (physaddr, size,IOMAP_WRITETHROUGH ); } -static inline void *z_remap_fullcache (unsigned long physaddr, +static inline void __iomem *z_remap_fullcache (unsigned long physaddr,unsigned long size) {return __ioremap (physaddr, size,IOMAP_FULL_CACHING );
Signature · 1 line
0.99.9.GIT