This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-ppc64 / io.h

diff --git a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h
index 23feb81..f2db3d8 100644 (file)
--- a/include/asm-ppc64/io.h
+++ b/include/asm-ppc64/io.h
@@ -1,4 +1,4 @@
- #ifndef _PPC64_IO_H
+#ifndef _PPC64_IO_H
 #define _PPC64_IO_H
 
 /* 
@@ -158,8 +158,6 @@ extern void _outsw_ns(volatile u16 *port, const void *buf, int ns);
 extern void _insl_ns(volatile u32 *port, void *buf, int nl);
 extern void _outsl_ns(volatile u32 *port, const void *buf, int nl);
 
-#define mmiowb()
-
 /*
  * output pause versions need a delay at least for the
  * w83c105 ide controller in a p610.
@@ -205,7 +203,7 @@ extern void __iomem *ioremap(unsigned long address, unsigned long size);
 #define ioremap_nocache(addr, size)    ioremap((addr), (size))
 extern int iounmap_explicit(volatile void __iomem *addr, unsigned long size);
 extern void iounmap(volatile void __iomem *addr);
-extern void __iomem * reserve_phb_iospace(unsigned long size);
+extern void * reserve_phb_iospace(unsigned long size);
 
 /**
  *     virt_to_phys    -       map virtual addresses to physical
@@ -273,7 +271,7 @@ static inline void iosync(void)
  * and should not be used directly by device drivers.  Use inb/readb
  * instead.
  */
-static inline int in_8(const volatile unsigned char __iomem *addr)
+static inline int in_8(volatile unsigned char *addr)
 {
        int ret;
 
@@ -282,13 +280,13 @@ static inline int in_8(const volatile unsigned char __iomem *addr)
        return ret;
 }
 
-static inline void out_8(volatile unsigned char __iomem *addr, int val)
+static inline void out_8(volatile unsigned char *addr, int val)
 {
        __asm__ __volatile__("stb%U0%X0 %1,%0; sync"
                             : "=m" (*addr) : "r" (val));
 }
 
-static inline int in_le16(const volatile unsigned short __iomem *addr)
+static inline int in_le16(volatile unsigned short *addr)
 {
        int ret;
 
@@ -297,7 +295,7 @@ static inline int in_le16(const volatile unsigned short __iomem *addr)
        return ret;
 }
 
-static inline int in_be16(const volatile unsigned short __iomem *addr)
+static inline int in_be16(volatile unsigned short *addr)
 {
        int ret;
 
@@ -306,19 +304,19 @@ static inline int in_be16(const volatile unsigned short __iomem *addr)
        return ret;
 }
 
-static inline void out_le16(volatile unsigned short __iomem *addr, int val)
+static inline void out_le16(volatile unsigned short *addr, int val)
 {
        __asm__ __volatile__("sthbrx %1,0,%2; sync"
                             : "=m" (*addr) : "r" (val), "r" (addr));
 }
 
-static inline void out_be16(volatile unsigned short __iomem *addr, int val)
+static inline void out_be16(volatile unsigned short *addr, int val)
 {
        __asm__ __volatile__("sth%U0%X0 %1,%0; sync"
                             : "=m" (*addr) : "r" (val));
 }
 
-static inline unsigned in_le32(const volatile unsigned __iomem *addr)
+static inline unsigned in_le32(volatile unsigned *addr)
 {
        unsigned ret;
 
@@ -327,7 +325,7 @@ static inline unsigned in_le32(const volatile unsigned __iomem *addr)
        return ret;
 }
 
-static inline unsigned in_be32(const volatile unsigned __iomem *addr)
+static inline unsigned in_be32(volatile unsigned *addr)
 {
        unsigned ret;
 
@@ -336,19 +334,19 @@ static inline unsigned in_be32(const volatile unsigned __iomem *addr)
        return ret;
 }
 
-static inline void out_le32(volatile unsigned __iomem *addr, int val)
+static inline void out_le32(volatile unsigned *addr, int val)
 {
        __asm__ __volatile__("stwbrx %1,0,%2; sync" : "=m" (*addr)
                             : "r" (val), "r" (addr));
 }
 
-static inline void out_be32(volatile unsigned __iomem *addr, int val)
+static inline void out_be32(volatile unsigned *addr, int val)
 {
        __asm__ __volatile__("stw%U0%X0 %1,%0; sync"
                             : "=m" (*addr) : "r" (val));
 }
 
-static inline unsigned long in_le64(const volatile unsigned long __iomem *addr)
+static inline unsigned long in_le64(volatile unsigned long *addr)
 {
        unsigned long tmp, ret;
 
@@ -367,7 +365,7 @@ static inline unsigned long in_le64(const volatile unsigned long __iomem *addr)
        return ret;
 }
 
-static inline unsigned long in_be64(const volatile unsigned long __iomem *addr)
+static inline unsigned long in_be64(volatile unsigned long *addr)
 {
        unsigned long ret;
 
@@ -376,7 +374,7 @@ static inline unsigned long in_be64(const volatile unsigned long __iomem *addr)
        return ret;
 }
 
-static inline void out_le64(volatile unsigned long __iomem *addr, unsigned long val)
+static inline void out_le64(volatile unsigned long *addr, unsigned long val)
 {
        unsigned long tmp;
 
@@ -393,7 +391,7 @@ static inline void out_le64(volatile unsigned long __iomem *addr, unsigned long
                             : "=&r" (tmp) , "=&r" (val) : "1" (val) , "b" (addr) , "m" (*addr));
 }
 
-static inline void out_be64(volatile unsigned long __iomem *addr, unsigned long val)
+static inline void out_be64(volatile unsigned long *addr, unsigned long val)
 {
        __asm__ __volatile__("std%U0%X0 %1,%0; sync" : "=m" (*addr) : "r" (val));
 }
@@ -438,10 +436,6 @@ out:
 #define dma_cache_wback(_start,_size)          do { } while (0)
 #define dma_cache_wback_inv(_start,_size)      do { } while (0)
 
-/* Check of existence of legacy devices */
-extern int check_legacy_ioport(unsigned long base_port);
-
-
 #endif /* __KERNEL__ */
 
 #endif /* _PPC64_IO_H */