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 / arm / mach-ebsa110 / io.c

diff --git a/arch/arm/mach-ebsa110/io.c b/arch/arm/mach-ebsa110/io.c
index 9205e65..c648bfb 100644 (file)
--- a/arch/arm/mach-ebsa110/io.c
+++ b/arch/arm/mach-ebsa110/io.c
@@ -24,12 +24,13 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 
+#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/page.h>
 
-static u32 __isamem_convert_addr(void *addr)
+static void __iomem *__isamem_convert_addr(void __iomem *addr)
 {
-       u32 ret, a = (u32) addr;
+       u32 ret, a = (u32 __force) addr;
 
        /*
         * The PCMCIA controller is wired up as follows:
@@ -53,41 +54,43 @@ static u32 __isamem_convert_addr(void *addr)
        ret += 0xe8000000;
 
        if ((a & 0x20000) == (a & 0x40000) >> 1)
-               return ret;
+               return (void __iomem *)ret;
 
        BUG();
-       return 0;
+       return NULL;
 }
 
 /*
  * read[bwl] and write[bwl]
  */
-u8 __readb(void *addr)
+u8 __readb(void __iomem *addr)
 {
-       u32 ret, a = __isamem_convert_addr(addr);
+       void __iomem *a = __isamem_convert_addr(addr);
+       u32 ret;
 
-       if ((int)addr & 1)
+       if ((unsigned long)addr & 1)
                ret = __raw_readl(a);
        else
                ret = __raw_readb(a);
        return ret;
 }
 
-u16 __readw(void *addr)
+u16 __readw(void __iomem *addr)
 {
-       u32 a = __isamem_convert_addr(addr);
+       void __iomem *a = __isamem_convert_addr(addr);
 
-       if ((int)addr & 1)
+       if ((unsigned long)addr & 1)
                BUG();
 
        return __raw_readw(a);
 }
 
-u32 __readl(void *addr)
+u32 __readl(void __iomem *addr)
 {
-       u32 ret, a = __isamem_convert_addr(addr);
+       void __iomem *a = __isamem_convert_addr(addr);
+       u32 ret;
 
-       if ((int)addr & 3)
+       if ((unsigned long)addr & 3)
                BUG();
 
        ret = __raw_readw(a);
@@ -99,31 +102,31 @@ EXPORT_SYMBOL(__readb);
 EXPORT_SYMBOL(__readw);
 EXPORT_SYMBOL(__readl);
 
-void __writeb(u8 val, void *addr)
+void __writeb(u8 val, void __iomem *addr)
 {
-       u32 a = __isamem_convert_addr(addr);
+       void __iomem *a = __isamem_convert_addr(addr);
 
-       if ((int)addr & 1)
+       if ((unsigned long)addr & 1)
                __raw_writel(val, a);
        else
                __raw_writeb(val, a);
 }
 
-void __writew(u16 val, void *addr)
+void __writew(u16 val, void __iomem *addr)
 {
-       u32 a = __isamem_convert_addr(addr);
+       void __iomem *a = __isamem_convert_addr(addr);
 
-       if ((int)addr & 1)
+       if ((unsigned long)addr & 1)
                BUG();
 
        __raw_writew(val, a);
 }
 
-void __writel(u32 val, void *addr)
+void __writel(u32 val, void __iomem *addr)
 {
-       u32 a = __isamem_convert_addr(addr);
+       void __iomem *a = __isamem_convert_addr(addr);
 
-       if ((int)addr & 3)
+       if ((unsigned long)addr & 3)
                BUG();
 
        __raw_writew(val, a);
@@ -151,9 +154,9 @@ u8 __inb8(unsigned int port)
         * The SuperIO registers use sane addressing techniques...
         */
        if (SUPERIO_PORT(port))
-               ret = __raw_readb(ISAIO_BASE + (port << 2));
+               ret = __raw_readb((void __iomem *)ISAIO_BASE + (port << 2));
        else {
-               u32 a = ISAIO_BASE + ((port & ~1) << 1);
+               void __iomem *a = (void __iomem *)ISAIO_BASE + ((port & ~1) << 1);
 
                /*
                 * Shame nothing else does
@@ -172,45 +175,33 @@ u8 __inb8(unsigned int port)
  */
 u8 __inb16(unsigned int port)
 {
-       u32 ret;
+       unsigned int offset;
 
        /*
         * The SuperIO registers use sane addressing techniques...
         */
        if (SUPERIO_PORT(port))
-               ret = __raw_readb(ISAIO_BASE + (port << 2));
-       else {
-               u32 a = ISAIO_BASE + ((port & ~1) << 1);
+               offset = port << 2;
+       else
+               offset = (port & ~1) << 1 | (port & 1);
 
-               /*
-                * Shame nothing else does
-                */
-               ret = __raw_readb(a + (port & 1));
-       }
-       return ret;
+       return __raw_readb((void __iomem *)ISAIO_BASE + offset);
 }
 
 u16 __inw(unsigned int port)
 {
-       u32 ret;
+       unsigned int offset;
 
        /*
         * The SuperIO registers use sane addressing techniques...
         */
        if (SUPERIO_PORT(port))
-               ret = __raw_readw(ISAIO_BASE + (port << 2));
+               offset = port << 2;
        else {
-               u32 a = ISAIO_BASE + ((port & ~1) << 1);
-
-               /*
-                * Shame nothing else does
-                */
-               if (port & 1)
-                       BUG();
-
-               ret = __raw_readw(a);
+               offset = port << 1;
+               BUG_ON(port & 1);
        }
-       return ret;
+       return __raw_readw((void __iomem *)ISAIO_BASE + offset);
 }
 
 /*
@@ -218,12 +209,12 @@ u16 __inw(unsigned int port)
  */
 u32 __inl(unsigned int port)
 {
-       u32 a;
+       void __iomem *a;
 
        if (SUPERIO_PORT(port) || port & 3)
                BUG();
 
-       a = ISAIO_BASE + (port << 1);
+       a = (void __iomem *)ISAIO_BASE + ((port & ~1) << 1);
 
        return __raw_readw(a) | __raw_readw(a + 4) << 16;
 }
@@ -239,9 +230,9 @@ void __outb8(u8 val, unsigned int port)
         * The SuperIO registers use sane addressing techniques...
         */
        if (SUPERIO_PORT(port))
-               __raw_writeb(val, ISAIO_BASE + (port << 2));
+               __raw_writeb(val, (void __iomem *)ISAIO_BASE + (port << 2));
        else {
-               u32 a = ISAIO_BASE + ((port & ~1) << 1);
+               void __iomem *a = (void __iomem *)ISAIO_BASE + ((port & ~1) << 1);
 
                /*
                 * Shame nothing else does
@@ -255,37 +246,33 @@ void __outb8(u8 val, unsigned int port)
 
 void __outb16(u8 val, unsigned int port)
 {
+       unsigned int offset;
+
        /*
         * The SuperIO registers use sane addressing techniques...
         */
        if (SUPERIO_PORT(port))
-               __raw_writeb(val, ISAIO_BASE + (port << 2));
-       else {
-               u32 a = ISAIO_BASE + ((port & ~1) << 1);
+               offset = port << 2;
+       else
+               offset = (port & ~1) << 1 | (port & 1);
 
-               /*
-                * Shame nothing else does
-                */
-               __raw_writeb(val, a + (port & 1));
-       }
+       __raw_writeb(val, (void __iomem *)ISAIO_BASE + offset);
 }
 
 void __outw(u16 val, unsigned int port)
 {
-       u32 off;
+       unsigned int offset;
 
        /*
         * The SuperIO registers use sane addressing techniques...
         */
        if (SUPERIO_PORT(port))
-               off = port << 2;
+               offset = port << 2;
        else {
-               off = port << 1;
-               if (port & 1)
-                       BUG();
-
+               offset = port << 1;
+               BUG_ON(port & 1);
        }
-       __raw_writew(val, ISAIO_BASE + off);
+       __raw_writew(val, (void __iomem *)ISAIO_BASE + offset);
 }
 
 void __outl(u32 val, unsigned int port)
@@ -298,13 +285,6 @@ EXPORT_SYMBOL(__outb16);
 EXPORT_SYMBOL(__outw);
 EXPORT_SYMBOL(__outl);
 
-extern void __arch_writesb(unsigned long virt, const void *from, int len);
-extern void __arch_writesw(unsigned long virt, const void *from, int len);
-extern void __arch_writesl(unsigned long virt, const void *from, int len);
-extern void __arch_readsb(unsigned long virt, void *from, int len);
-extern void __arch_readsw(unsigned long virt, void *from, int len);
-extern void __arch_readsl(unsigned long virt, void *from, int len);
-
 void outsb(unsigned int port, const void *from, int len)
 {
        u32 off;
@@ -317,7 +297,7 @@ void outsb(unsigned int port, const void *from, int len)
                        BUG();
        }
 
-       __raw_writesb(ISAIO_BASE + off, from, len);
+       __raw_writesb((void __iomem *)ISAIO_BASE + off, from, len);
 }
 
 void insb(unsigned int port, void *from, int len)
@@ -332,7 +312,7 @@ void insb(unsigned int port, void *from, int len)
                        BUG();
        }
 
-       __raw_readsb(ISAIO_BASE + off, from, len);
+       __raw_readsb((void __iomem *)ISAIO_BASE + off, from, len);
 }
 
 EXPORT_SYMBOL(outsb);
@@ -350,7 +330,7 @@ void outsw(unsigned int port, const void *from, int len)
                        BUG();
        }
 
-       __raw_writesw(ISAIO_BASE + off, from, len);
+       __raw_writesw((void __iomem *)ISAIO_BASE + off, from, len);
 }
 
 void insw(unsigned int port, void *from, int len)
@@ -365,7 +345,7 @@ void insw(unsigned int port, void *from, int len)
                        BUG();
        }
 
-       __raw_readsw(ISAIO_BASE + off, from, len);
+       __raw_readsw((void __iomem *)ISAIO_BASE + off, from, len);
 }
 
 EXPORT_SYMBOL(outsw);
@@ -382,7 +362,7 @@ void outsl(unsigned int port, const void *from, int len)
        if (SUPERIO_PORT(port) || port & 3)
                BUG();
 
-       __raw_writesw(ISAIO_BASE + off, from, len << 1);
+       __raw_writesw((void __iomem *)ISAIO_BASE + off, from, len << 1);
 }
 
 void insl(unsigned int port, void *from, int len)
@@ -392,7 +372,7 @@ void insl(unsigned int port, void *from, int len)
        if (SUPERIO_PORT(port) || port & 3)
                BUG();
 
-       __raw_readsw(ISAIO_BASE + off, from, len << 1);
+       __raw_readsw((void __iomem *)ISAIO_BASE + off, from, len << 1);
 }
 
 EXPORT_SYMBOL(outsl);