Merge branch 'cleanup/__iomem' into next/cleanup

__iomem annotation cleanup branch from Arnd.

* cleanup/__iomem: (21 commits)
  net: seeq: use __iomem pointers for MMIO
  video: da8xx-fb: use __iomem pointers for MMIO
  scsi: eesox: use __iomem pointers for MMIO
  serial: ks8695: use __iomem pointers for MMIO
  input: rpcmouse: use __iomem pointers for MMIO
  ARM: samsung: use __iomem pointers for MMIO
  ARM: spear13xx: use __iomem pointers for MMIO
  ARM: sa1100: use __iomem pointers for MMIO
  ARM: prima2: use __iomem pointers for MMIO
  ARM: nomadik: use __iomem pointers for MMIO
  ARM: msm: use __iomem pointers for MMIO
  ARM: lpc32xx: use __iomem pointers for MMIO
  ARM: ks8695: use __iomem pointers for MMIO
  ARM: ixp4xx: use __iomem pointers for MMIO
  ARM: iop32x: use __iomem pointers for MMIO
  ARM: iop13xx: use __iomem pointers for MMIO
  ARM: integrator: use __iomem pointers for MMIO
  ARM: imx: use __iomem pointers for MMIO
  ARM: ebsa110: use __iomem pointers for MMIO
  ARM: at91: use __iomem pointers for MMIO
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

5 files changed, 10 insertions, 10 deletions

diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c
index 272deddc8db..21c60fea5d3 100644
--- a/drivers/input/mouse/rpcmouse.c
+++ b/drivers/input/mouse/rpcmouse.c
@@ -42,7 +42,7 @@ static irqreturn_t rpcmouse_irq(int irq, void *dev_id)
 
         x = (short) iomd_readl(IOMD_MOUSEX);
         y = (short) iomd_readl(IOMD_MOUSEY);
-        b = (short) (__raw_readl(0xe0310000) ^ 0x70);
+        b = (short) (__raw_readl(IOMEM(0xe0310000)) ^ 0x70);
 
         dx = x - rpcmouse_lastx;
         dy = y - rpcmouse_lasty;
diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c
index df808ac8cb6..6a40dd03a32 100644
--- a/drivers/net/ethernet/seeq/ether3.c
+++ b/drivers/net/ethernet/seeq/ether3.c
@@ -99,13 +99,13 @@ typedef enum {
  * The SEEQ8005 doesn't like us writing to its registers
  * too quickly.
  */
-static inline void ether3_outb(int v, const void __iomem *r)
+static inline void ether3_outb(int v, void __iomem *r)
 {
         writeb(v, r);
         udelay(1);
 }
 
-static inline void ether3_outw(int v, const void __iomem *r)
+static inline void ether3_outw(int v, void __iomem *r)
 {
         writew(v, r);
         udelay(1);
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index edfd12b48c2..968d08358d2 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -273,7 +273,7 @@ static void eesoxscsi_buffer_out(void *buf, int length, void __iomem *base)
 {
         const void __iomem *reg_fas = base + EESOX_FAS216_OFFSET;
         const void __iomem *reg_dmastat = base + EESOX_DMASTAT;
-        const void __iomem *reg_dmadata = base + EESOX_DMADATA;
+        void __iomem *reg_dmadata = base + EESOX_DMADATA;
 
         do {
                 unsigned int status;
diff --git a/drivers/tty/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c
index 7c13639c597..9bd004f9da8 100644
--- a/drivers/tty/serial/serial_ks8695.c
+++ b/drivers/tty/serial/serial_ks8695.c
@@ -548,8 +548,8 @@ static struct uart_ops ks8695uart_pops = {
 
 static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = {
         {
-                .membase        = (void *) KS8695_UART_VA,
-                .mapbase        = KS8695_UART_VA,
+                .membase        = KS8695_UART_VA,
+                .mapbase        = KS8695_UART_PA,
                 .iotype         = SERIAL_IO_MEM,
                 .irq            = KS8695_IRQ_UART_TX,
                 .uartclk        = KS8695_CLOCK_RATE * 16,
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 7ae9d53f2bf..113d43a16f5 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -131,7 +131,7 @@
 #define UPPER_MARGIN    32
 #define LOWER_MARGIN    32
 
-static resource_size_t da8xx_fb_reg_base;
+static void __iomem *da8xx_fb_reg_base;
 static struct resource *lcdc_regs;
 static unsigned int lcd_revision;
 static irq_handler_t lcdc_irq_handler;
@@ -951,7 +951,7 @@ static int __devexit fb_remove(struct platform_device *dev)
                 clk_disable(par->lcdc_clk);
                 clk_put(par->lcdc_clk);
                 framebuffer_release(info);
-                iounmap((void __iomem *)da8xx_fb_reg_base);
+                iounmap(da8xx_fb_reg_base);
                 release_mem_region(lcdc_regs->start, resource_size(lcdc_regs));
 
         }
@@ -1171,7 +1171,7 @@ static int __devinit fb_probe(struct platform_device *device)
         if (!lcdc_regs)
                 return -EBUSY;
 
-        da8xx_fb_reg_base = (resource_size_t)ioremap(lcdc_regs->start, len);
+        da8xx_fb_reg_base = ioremap(lcdc_regs->start, len);
         if (!da8xx_fb_reg_base) {
                 ret = -EBUSY;
                 goto err_request_mem;
@@ -1392,7 +1392,7 @@ err_clk_put:
         clk_put(fb_clk);
 
 err_ioremap:
-        iounmap((void __iomem *)da8xx_fb_reg_base);
+        iounmap(da8xx_fb_reg_base);
 
 err_request_mem:
         release_mem_region(lcdc_regs->start, len);