1 files changed, 9 insertions, 70 deletions

diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/kernel/io_opsput.c
index aaf42f9f76da..e34951e8156f 100644
--- a/arch/m32r/kernel/io_opsput.c
+++ b/arch/m32r/kernel/io_opsput.c
@@ -1,10 +1,10 @@
 /*
- *  linux/arch/m32r/kernel/io_mappi.c
+ *  linux/arch/m32r/kernel/io_opsput.c
  *
  *  Typical I/O routines for OPSPUT board.
  *
- *  Copyright (c) 2001, 2002  Hiroyuki Kondo, Hirokazu Takata,
- *                            Hitoshi Yamamoto, Takeo Takahashi
+ *  Copyright (c) 2001-2005  Hiroyuki Kondo, Hirokazu Takata,
+ *                           Hitoshi Yamamoto, Takeo Takahashi
  *
  *  This file is subject to the terms and conditions of the GNU General
  *  Public License.  See the file "COPYING" in the main directory of this
@@ -98,7 +98,6 @@ unsigned char _inb(unsigned long port)
 {
         if (port >= LAN_IOSTART && port < LAN_IOEND)
                 return _ne_inb(PORT2ADDR_NE(port));
-
 #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
         else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
                 unsigned char b;
@@ -118,7 +117,6 @@ unsigned short _inw(unsigned long port)
         else if(port >= 0x340 && port < 0x3a0)
                 return *(volatile unsigned short *)PORT2ADDR_USB(port);
 #endif
-
 #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
         else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
                 unsigned short w;
@@ -143,55 +141,21 @@ unsigned long _inl(unsigned long port)
 
 unsigned char _inb_p(unsigned long port)
 {
-        unsigned char  v;
-
-        if (port >= LAN_IOSTART && port < LAN_IOEND)
-                v = _ne_inb(PORT2ADDR_NE(port));
-        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
-        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-                unsigned char b;
-                pcc_ioread_byte(0, port, &b, sizeof(b), 1, 0);
-                return b;
-        } else
-#endif
-                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 >= LAN_IOSTART && port < LAN_IOEND)
-                v = _ne_inw(PORT2ADDR_NE(port));
-        else
-#if defined(CONFIG_USB)
-        if(port >= 0x340 && port < 0x3a0)
-                return *(volatile unsigned short *)PORT2ADDR_USB(port);
-        else
-#endif
-
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
-        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-                unsigned short w;
-                pcc_ioread_word(0, port, &w, sizeof(w), 1, 0);
-                return w;
-        } else
-#endif
-                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);
 }
@@ -219,7 +183,6 @@ void _outw(unsigned short w, unsigned long port)
                 *(volatile unsigned short *)PORT2ADDR_USB(port) = w;
         else
 #endif
-
 #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
         if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
                 pcc_iowrite_word(0, port, &w, sizeof(w), 1, 0);
@@ -240,43 +203,19 @@ void _outl(unsigned long l, unsigned long port)
 
 void _outb_p(unsigned char b, unsigned long port)
 {
-        if (port >= LAN_IOSTART && port < LAN_IOEND)
-                _ne_outb(b, PORT2ADDR_NE(port));
-        else
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
-        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-                pcc_iowrite_byte(0, port, &b, sizeof(b), 1, 0);
-        } else
-#endif
-                *(volatile unsigned char *)PORT2ADDR(port) = b;
-
+        _outb(b, port);
         delay();
 }
 
 void _outw_p(unsigned short w, unsigned long port)
 {
-        if (port >= LAN_IOSTART && port < LAN_IOEND)
-                _ne_outw(w, PORT2ADDR_NE(port));
-        else
-#if defined(CONFIG_USB)
-        if(port >= 0x340 && port < 0x3a0)
-                *(volatile unsigned short *)PORT2ADDR_USB(port) = w;
-        else
-#endif
-
-#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC)
-        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
-                pcc_iowrite_word(0, port, &w, sizeof(w), 1, 0);
-        } else
-#endif
-                *(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();
 }