aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-parisc/io.h
diff options
context:
space:
mode:
authorHelge Deller <deller@parisc-linux.org>2006-03-23 02:32:46 -0500
committerKyle McMartin <kyle@hera.kernel.org>2006-03-30 12:48:48 -0500
commit29ef8295327653ff09a56285c35213cd31fa54b3 (patch)
treef438a0a36fcde67c3ea6db45b1400c29eb9366be /include/asm-parisc/io.h
parent857600c77161fd36e30cd6bcca9a0a8676036323 (diff)
[PARISC] Enable ioremap functionality unconditionally
Enable CONFIG_HPPA_IOREMAP by default and remove all now unnecessary code. Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include/asm-parisc/io.h')
-rw-r--r--include/asm-parisc/io.h58
1 files changed, 1 insertions, 57 deletions
diff --git a/include/asm-parisc/io.h b/include/asm-parisc/io.h
index 2fb253255102..bcfe0b09c93f 100644
--- a/include/asm-parisc/io.h
+++ b/include/asm-parisc/io.h
@@ -176,12 +176,7 @@ extern inline void * ioremap_nocache(unsigned long offset, unsigned long size)
176 176
177extern void iounmap(void __iomem *addr); 177extern void iounmap(void __iomem *addr);
178 178
179/* 179
180 * CONFIG_HPPA_IOREMAP is the magic flag to enable or disable real ioremap()
181 * functionality. It's currently disabled because it may not work on some
182 * machines.
183 */
184#ifdef CONFIG_HPPA_IOREMAP
185static inline unsigned char __raw_readb(const volatile void __iomem *addr) 180static inline unsigned char __raw_readb(const volatile void __iomem *addr)
186{ 181{
187 return (*(volatile unsigned char __force *) (addr)); 182 return (*(volatile unsigned char __force *) (addr));
@@ -215,57 +210,6 @@ static inline void __raw_writeq(unsigned long long b, volatile void __iomem *add
215{ 210{
216 *(volatile unsigned long long __force *) addr = b; 211 *(volatile unsigned long long __force *) addr = b;
217} 212}
218#else /* !CONFIG_HPPA_IOREMAP */
219static inline unsigned char __raw_readb(const volatile void __iomem *addr)
220{
221 __raw_check_addr(addr);
222
223 return gsc_readb((unsigned long) addr);
224}
225static inline unsigned short __raw_readw(const volatile void __iomem *addr)
226{
227 __raw_check_addr(addr);
228
229 return gsc_readw((unsigned long) addr);
230}
231static inline unsigned int __raw_readl(const volatile void __iomem *addr)
232{
233 __raw_check_addr(addr);
234
235 return gsc_readl((unsigned long) addr);
236}
237static inline unsigned long long __raw_readq(const volatile void __iomem *addr)
238{
239 __raw_check_addr(addr);
240
241 return gsc_readq((unsigned long) addr);
242}
243
244static inline void __raw_writeb(unsigned char b, volatile void __iomem *addr)
245{
246 __raw_check_addr(addr);
247
248 gsc_writeb(b, (unsigned long) addr);
249}
250static inline void __raw_writew(unsigned short b, volatile void __iomem *addr)
251{
252 __raw_check_addr(addr);
253
254 gsc_writew(b, (unsigned long) addr);
255}
256static inline void __raw_writel(unsigned int b, volatile void __iomem *addr)
257{
258 __raw_check_addr(addr);
259
260 gsc_writel(b, (unsigned long) addr);
261}
262static inline void __raw_writeq(unsigned long long b, volatile void __iomem *addr)
263{
264 __raw_check_addr(addr);
265
266 gsc_writeq(b, (unsigned long) addr);
267}
268#endif /* !CONFIG_HPPA_IOREMAP */
269 213
270/* readb can never be const, so use __fswab instead of le*_to_cpu */ 214/* readb can never be const, so use __fswab instead of le*_to_cpu */
271#define readb(addr) __raw_readb(addr) 215#define readb(addr) __raw_readb(addr)