diff options
| author | Alexander Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2004-12-28 18:41:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-28 18:41:18 -0800 |
| commit | e51056774e969fecfa98a2882f34f7038e09800a (patch) | |
| tree | 44c2d2c0162c6ddb179679b2f176beb45bbe1f6f /include | |
| parent | 4b14c72f0f558e435a03085fdd7d1f0111c1eb93 (diff) | |
[PATCH] x86_64 io.h annotations
x86-64 memcpy_toio(), memcpy_fromio(), memset_io() and read{b,w,l,q}(),
switched to standard prototypes.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86_64/io.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h index c4734243f814..ce379aee7355 100644 --- a/include/asm-x86_64/io.h +++ b/include/asm-x86_64/io.h @@ -175,19 +175,19 @@ extern void iounmap(volatile void __iomem *addr); * memory location directly. */ -static inline __u8 __readb(volatile void __iomem *addr) +static inline __u8 __readb(const volatile void __iomem *addr) { return *(__force volatile __u8 *)addr; } -static inline __u16 __readw(volatile void __iomem *addr) +static inline __u16 __readw(const volatile void __iomem *addr) { return *(__force volatile __u16 *)addr; } -static inline __u32 __readl(volatile void __iomem *addr) +static inline __u32 __readl(const volatile void __iomem *addr) { return *(__force volatile __u32 *)addr; } -static inline __u64 __readq(volatile void __iomem *addr) +static inline __u64 __readq(const volatile void __iomem *addr) { return *(__force volatile __u64 *)addr; } @@ -249,20 +249,20 @@ static inline void __writew(__u16 b, volatile void __iomem *addr) #define __raw_writel writel #define __raw_writeq writeq -void *__memcpy_fromio(void*,unsigned long,unsigned); -void *__memcpy_toio(unsigned long,const void*,unsigned); +void __memcpy_fromio(void*,unsigned long,unsigned); +void __memcpy_toio(unsigned long,const void*,unsigned); -static inline void *memcpy_fromio(void *to, volatile void __iomem *from, unsigned len) +static inline void memcpy_fromio(void *to, const volatile void __iomem *from, unsigned len) { - return __memcpy_fromio(to,(unsigned long)from,len); + __memcpy_fromio(to,(unsigned long)from,len); } -static inline void *memcpy_toio(volatile void __iomem *to, const void *from, unsigned len) +static inline void memcpy_toio(volatile void __iomem *to, const void *from, unsigned len) { - return __memcpy_toio((unsigned long)to,from,len); + __memcpy_toio((unsigned long)to,from,len); } -static inline void *memset_io(volatile void __iomem *a, int b, size_t c) +static inline void memset_io(volatile void __iomem *a, int b, size_t c) { - return memset((__force void *)a,b,c); + memset((__force void *)a,b,c); } /* |