Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / m32r / kernel / io_oaks32r.c

diff --git a/arch/m32r/kernel/io_oaks32r.c b/arch/m32r/kernel/io_oaks32r.c
index 7fcbf20..910dd13 100644 (file)
--- a/arch/m32r/kernel/io_oaks32r.c
+++ b/arch/m32r/kernel/io_oaks32r.c
@@ -3,12 +3,10 @@
  *
  *  Typical I/O routines for OAKS32R board.
  *
- *  Copyright (c) 2001-2004  Hiroyuki Kondo, Hirokazu Takata,
- *                            Hitoshi Yamamoto, Mamoru Sakugawa
+ *  Copyright (c) 2001-2005  Hiroyuki Kondo, Hirokazu Takata,
+ *                           Hitoshi Yamamoto, Mamoru Sakugawa
  */
 
-/* $Id$ */
-
 #include <linux/config.h>
 #include <asm/m32r.h>
 #include <asm/page.h>
@@ -16,17 +14,17 @@
 
 #define PORT2ADDR(port)  _port2addr(port)
 
-static __inline__ void *_port2addr(unsigned long port)
+static inline void *_port2addr(unsigned long port)
 {
-       return (void *)(port + NONCACHE_OFFSET);
+       return (void *)(port | NONCACHE_OFFSET);
 }
 
-static __inline__  void *_port2addr_ne(unsigned long port)
+static inline  void *_port2addr_ne(unsigned long port)
 {
        return (void *)((port<<1) + NONCACHE_OFFSET + 0x02000000);
 }
 
-static __inline__ void delay(void)
+static inline void delay(void)
 {
        __asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory");
 }
@@ -37,12 +35,12 @@ static __inline__ void delay(void)
 
 #define PORT2ADDR_NE(port)  _port2addr_ne(port)
 
-static __inline__ unsigned char _ne_inb(void *portp)
+static inline unsigned char _ne_inb(void *portp)
 {
        return *(volatile unsigned char *)(portp+1);
 }
 
-static __inline__ unsigned short _ne_inw(void *portp)
+static inline unsigned short _ne_inw(void *portp)
 {
        unsigned short tmp;
 
@@ -51,21 +49,22 @@ static __inline__ unsigned short _ne_inw(void *portp)
        return tmp;
 }
 
-static __inline__  void _ne_insb(void *portp, void * addr, unsigned long count)
+static inline  void _ne_insb(void *portp, void *addr, unsigned long count)
 {
        unsigned char *buf = addr;
-       while (count--) *buf++ = *(volatile unsigned char *)(portp+1);
+       while (count--)
+               *buf++ = *(volatile unsigned char *)(portp+1);
 }
 
-static __inline__ void _ne_outb(unsigned char b, void *portp)
+static inline void _ne_outb(unsigned char b, void *portp)
 {
        *(volatile unsigned char *)(portp+1) = b;
 }
 
-static __inline__ void _ne_outw(unsigned short w, void *portp)
+static inline void _ne_outw(unsigned short w, void *portp)
 {
-  *(volatile unsigned short *)portp =  (w >> 8);
-  *(volatile unsigned short *)(portp+2) =  (w & 0xff);
+       *(volatile unsigned short *)portp =  (w >> 8);
+       *(volatile unsigned short *)(portp+2) =  (w & 0xff);
 }
 
 unsigned char _inb(unsigned long port)
@@ -91,35 +90,21 @@ unsigned long _inl(unsigned long port)
 
 unsigned char _inb_p(unsigned long port)
 {
-       unsigned char  v;
-
-       if (port >= 0x300 && port < 0x320)
-               v = _ne_inb(PORT2ADDR_NE(port));
-       else
-               v = *(volatile unsigned char *)PORT2ADDR(port);
-
+       unsigned char v = _inb(port);
        delay();
        return (v);
 }
 
 unsigned short _inw_p(unsigned long port)
 {
-       unsigned short  v;
-
-       if (port >= 0x300 && port < 0x320)
-               v = _ne_inw(PORT2ADDR_NE(port));
-       else
-               v = *(volatile unsigned short *)PORT2ADDR(port);
-
+       unsigned short v = _inw(port);
        delay();
        return (v);
 }
 
 unsigned long _inl_p(unsigned long port)
 {
-       unsigned long  v;
-
-       v = *(volatile unsigned long *)PORT2ADDR(port);
+       unsigned long v = _inl(port);
        delay();
        return (v);
 }
@@ -147,97 +132,98 @@ void _outl(unsigned long l, unsigned long port)
 
 void _outb_p(unsigned char b, unsigned long port)
 {
-       if (port >= 0x300 && port < 0x320)
-               _ne_outb(b, PORT2ADDR_NE(port));
-       else
-               *(volatile unsigned char *)PORT2ADDR(port) = b;
-
+       _outb(b, port);
        delay();
 }
 
 void _outw_p(unsigned short w, unsigned long port)
 {
-       if (port >= 0x300 && port < 0x320)
-               _ne_outw(w, PORT2ADDR_NE(port));
-       else
-               *(volatile unsigned short *)PORT2ADDR(port) = w;
-
+       _outw(w, port);
        delay();
 }
 
 void _outl_p(unsigned long l, unsigned long port)
 {
-       *(volatile unsigned long *)PORT2ADDR(port) = l;
+       _outl(l, port);
        delay();
 }
 
-void _insb(unsigned int port, void * addr, unsigned long count)
+void _insb(unsigned int port, void *addr, unsigned long count)
 {
        if (port >= 0x300 && port < 0x320)
                _ne_insb(PORT2ADDR_NE(port), addr, count);
        else {
                unsigned char *buf = addr;
                unsigned char *portp = PORT2ADDR(port);
-               while(count--) *buf++ = *(volatile unsigned char *)portp;
+               while (count--)
+                       *buf++ = *(volatile unsigned char *)portp;
        }
 }
 
-void _insw(unsigned int port, void * addr, unsigned long count)
+void _insw(unsigned int port, void *addr, unsigned long count)
 {
        unsigned short *buf = addr;
        unsigned short *portp;
 
        if (port >= 0x300 && port < 0x320) {
                portp = PORT2ADDR_NE(port);
-               while (count--) *buf++ = _ne_inw(portp);
+               while (count--)
+                       *buf++ = _ne_inw(portp);
        } else {
                portp = PORT2ADDR(port);
-               while (count--) *buf++ = *(volatile unsigned short *)portp;
+               while (count--)
+                       *buf++ = *(volatile unsigned short *)portp;
        }
 }
 
-void _insl(unsigned int port, void * addr, unsigned long count)
+void _insl(unsigned int port, void *addr, unsigned long count)
 {
        unsigned long *buf = addr;
        unsigned long *portp;
 
        portp = PORT2ADDR(port);
-       while (count--) *buf++ = *(volatile unsigned long *)portp;
+       while (count--)
+               *buf++ = *(volatile unsigned long *)portp;
 }
 
-void _outsb(unsigned int port, const void * addr, unsigned long count)
+void _outsb(unsigned int port, const void *addr, unsigned long count)
 {
        const unsigned char *buf = addr;
        unsigned char *portp;
 
        if (port >= 0x300 && port < 0x320) {
                portp = PORT2ADDR_NE(port);
-               while (count--) _ne_outb(*buf++, portp);
+               while (count--)
+                       _ne_outb(*buf++, portp);
        } else {
                portp = PORT2ADDR(port);
-               while(count--) *(volatile unsigned char *)portp = *buf++;
+               while (count--)
+                       *(volatile unsigned char *)portp = *buf++;
        }
 }
 
-void _outsw(unsigned int port, const void * addr, unsigned long count)
+void _outsw(unsigned int port, const void *addr, unsigned long count)
 {
        const unsigned short *buf = addr;
        unsigned short *portp;
 
        if (port >= 0x300 && port < 0x320) {
                portp = PORT2ADDR_NE(port);
-               while (count--) _ne_outw(*buf++, portp);
+               while (count--)
+                       _ne_outw(*buf++, portp);
        } else {
                portp = PORT2ADDR(port);
-               while(count--) *(volatile unsigned short *)portp = *buf++;
+               while (count--)
+                       *(volatile unsigned short *)portp = *buf++;
        }
 }
 
-void _outsl(unsigned int port, const void * addr, unsigned long count)
+void _outsl(unsigned int port, const void *addr, unsigned long count)
 {
        const unsigned long *buf = addr;
        unsigned char *portp;
 
        portp = PORT2ADDR(port);
-       while(count--) *(volatile unsigned long *)portp = *buf++;
+       while (count--)
+               *(volatile unsigned long *)portp = *buf++;
 }