diff options
author | Kyle McMartin <kyle@shortfin.cabal.ca> | 2009-02-16 03:05:02 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@treachery.i.cabal.ca> | 2009-03-13 01:20:18 -0400 |
commit | 9dfe914da83ebc88f85d94b4d30d0e45882766d1 (patch) | |
tree | 36646ee410eb71709e6671dd70c04d803d96a23a | |
parent | 7c4be70e6d07582a111a1b66942c8a1d45528dfb (diff) |
parisc: convert (read|write)bwlq to inlines
Kills the 'value computed but not used' due to
leX_to_cpu.
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
-rw-r--r-- | arch/parisc/include/asm/io.h | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h index d3031d1f9d03..1fa905ea53de 100644 --- a/arch/parisc/include/asm/io.h +++ b/arch/parisc/include/asm/io.h | |||
@@ -174,15 +174,39 @@ static inline void __raw_writeq(unsigned long long b, volatile void __iomem *add | |||
174 | *(volatile unsigned long long __force *) addr = b; | 174 | *(volatile unsigned long long __force *) addr = b; |
175 | } | 175 | } |
176 | 176 | ||
177 | /* readb can never be const, so use __fswab instead of le*_to_cpu */ | 177 | static inline unsigned char readb(const volatile void __iomem *addr) |
178 | #define readb(addr) __raw_readb(addr) | 178 | { |
179 | #define readw(addr) le16_to_cpu(__raw_readw(addr)) | 179 | return __raw_readb(addr); |
180 | #define readl(addr) le32_to_cpu(__raw_readl(addr)) | 180 | } |
181 | #define readq(addr) le64_to_cpu(__raw_readq(addr)) | 181 | static inline unsigned short readw(const volatile void __iomem *addr) |
182 | #define writeb(b, addr) __raw_writeb(b, addr) | 182 | { |
183 | #define writew(b, addr) __raw_writew(cpu_to_le16(b), addr) | 183 | return le16_to_cpu(__raw_readw(addr)); |
184 | #define writel(b, addr) __raw_writel(cpu_to_le32(b), addr) | 184 | } |
185 | #define writeq(b, addr) __raw_writeq(cpu_to_le64(b), addr) | 185 | static inline unsigned int readl(const volatile void __iomem *addr) |
186 | { | ||
187 | return le32_to_cpu(__raw_readl(addr)); | ||
188 | } | ||
189 | static inline unsigned long long readq(const volatile void __iomem *addr) | ||
190 | { | ||
191 | return le64_to_cpu(__raw_readq(addr)); | ||
192 | } | ||
193 | |||
194 | static inline void writeb(unsigned char b, volatile void __iomem *addr) | ||
195 | { | ||
196 | __raw_writeb(b, addr); | ||
197 | } | ||
198 | static inline void writew(unsigned short w, volatile void __iomem *addr) | ||
199 | { | ||
200 | __raw_writew(cpu_to_le16(w), addr); | ||
201 | } | ||
202 | static inline void writel(unsigned int l, volatile void __iomem *addr) | ||
203 | { | ||
204 | __raw_writel(cpu_to_le32(l), addr); | ||
205 | } | ||
206 | static inline void writeq(unsigned long long q, volatile void __iomem *addr) | ||
207 | { | ||
208 | __raw_writeq(cpu_to_le64(q), addr); | ||
209 | } | ||
186 | 210 | ||
187 | #define readb_relaxed(addr) readb(addr) | 211 | #define readb_relaxed(addr) readb(addr) |
188 | #define readw_relaxed(addr) readw(addr) | 212 | #define readw_relaxed(addr) readw(addr) |