sh: mach-edosk7705: Fix up edosk7705 so it all builds again.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 20 insertions, 51 deletions

diff --git a/arch/sh/boards/mach-edosk7705/Makefile b/arch/sh/boards/mach-edosk7705/Makefile
index 14bdd531f116..cd54acb51499 100644
--- a/arch/sh/boards/mach-edosk7705/Makefile
+++ b/arch/sh/boards/mach-edosk7705/Makefile
@@ -3,4 +3,3 @@
 #
 
 obj-y    := setup.o io.o
-
diff --git a/arch/sh/boards/mach-edosk7705/io.c b/arch/sh/boards/mach-edosk7705/io.c
index 7d153e50a01b..5b9c57c43241 100644
--- a/arch/sh/boards/mach-edosk7705/io.c
+++ b/arch/sh/boards/mach-edosk7705/io.c
@@ -10,28 +10,24 @@
 
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/edosk7705.h>
 #include <asm/addrspace.h>
 
 #define SMC_IOADDR      0xA2000000
 
-#define maybebadio(name,port) \
-  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
-         #name, (port), (__u32) __builtin_return_address(0))
-
 /* Map the Ethernet addresses as if it is at 0x300 - 0x320 */
-unsigned long sh_edosk7705_isa_port2addr(unsigned long port)
+static unsigned long sh_edosk7705_isa_port2addr(unsigned long port)
 {
-     if (port >= 0x300 && port < 0x320) {
-          /* SMC91C96 registers are 4 byte aligned rather than the
-           * usual 2 byte!
-           */
-          return SMC_IOADDR + ( (port - 0x300) * 2);
-     }
+        /*
+         * SMC91C96 registers are 4 byte aligned rather than the
+         * usual 2 byte!
+         */
+        if (port >= 0x300 && port < 0x320)
+                return SMC_IOADDR + ((port - 0x300) * 2);
 
-     maybebadio(sh_edosk7705_isa_port2addr, port);
-     return port;
+        maybebadio(port);
+        return port;
 }
 
 /* Trying to read / write bytes on odd-byte boundaries to the Ethernet
@@ -42,53 +38,34 @@ unsigned long sh_edosk7705_isa_port2addr(unsigned long port)
  */
 unsigned char sh_edosk7705_inb(unsigned long port)
 {
-        if (port >= 0x300 && port < 0x320 && port & 0x01) {
-                return (volatile unsigned char)(generic_inw(port -1) >> 8);
-        }
-        return *(volatile unsigned char *)sh_edosk7705_isa_port2addr(port);
-}
+        if (port >= 0x300 && port < 0x320 && port & 0x01)
+                return __raw_readw(port - 1) >> 8;
 
-unsigned int sh_edosk7705_inl(unsigned long port)
-{
-        return *(volatile unsigned long *)port;
+        return __raw_readb(sh_edosk7705_isa_port2addr(port));
 }
 
 void sh_edosk7705_outb(unsigned char value, unsigned long port)
 {
         if (port >= 0x300 && port < 0x320 && port & 0x01) {
-                generic_outw(((unsigned short)value << 8), port -1);
+                __raw_writew(((unsigned short)value << 8), port - 1);
                 return;
         }
-        *(volatile unsigned char *)sh_edosk7705_isa_port2addr(port) = value;
-}
 
-void sh_edosk7705_outl(unsigned int value, unsigned long port)
-{
-        *(volatile unsigned long *)port = value;
+        __raw_writeb(value, sh_edosk7705_isa_port2addr(port));
 }
 
 void sh_edosk7705_insb(unsigned long port, void *addr, unsigned long count)
 {
         unsigned char *p = addr;
-        while (count--) *p++ = sh_edosk7705_inb(port);
-}
 
-void sh_edosk7705_insl(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned long *p = (unsigned long*)addr;
         while (count--)
-                *p++ = *(volatile unsigned long *)port;
+                *p++ = sh_edosk7705_inb(port);
 }
 
 void sh_edosk7705_outsb(unsigned long port, const void *addr, unsigned long count)
 {
-        unsigned char *p = (unsigned char*)addr;
-        while (count--) sh_edosk7705_outb(*p++, port);
-}
+        unsigned char *p = (unsigned char *)addr;
 
-void sh_edosk7705_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned long *p = (unsigned long*)addr;
-        while (count--) sh_edosk7705_outl(*p++, port);
+        while (count--)
+                sh_edosk7705_outb(*p++, port);
 }
-
diff --git a/arch/sh/boards/mach-edosk7705/setup.c b/arch/sh/boards/mach-edosk7705/setup.c
index ab3f47bffdf3..d59225e26fb9 100644
--- a/arch/sh/boards/mach-edosk7705/setup.c
+++ b/arch/sh/boards/mach-edosk7705/setup.c
@@ -9,6 +9,7 @@
  * board by S. Dunn, 2003.
  */
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <asm/machvec.h>
 #include <mach/edosk7705.h>
 
@@ -26,18 +27,10 @@ static struct sh_machine_vector mv_edosk7705 __initmv = {
         .mv_nr_irqs             = 80,
 
         .mv_inb                 = sh_edosk7705_inb,
-        .mv_inl                 = sh_edosk7705_inl,
         .mv_outb                = sh_edosk7705_outb,
-        .mv_outl                = sh_edosk7705_outl,
-
-        .mv_inl_p               = sh_edosk7705_inl,
-        .mv_outl_p              = sh_edosk7705_outl,
 
         .mv_insb                = sh_edosk7705_insb,
-        .mv_insl                = sh_edosk7705_insl,
         .mv_outsb               = sh_edosk7705_outsb,
-        .mv_outsl               = sh_edosk7705_outsl,
 
-        .mv_isa_port2addr       = sh_edosk7705_isa_port2addr,
         .mv_init_irq            = sh_edosk7705_init_irq,
 };