From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 17:24:06 +0000 (-0700)
Subject: Merge branch 'cleanup/__iomem' into next/cleanup
X-Git-Tag: upstream/snapshot3+hdmi~6582^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=268aebe4d04bf2ac1e839eff2c83519768460189;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

268aebe4d04bf2ac1e839eff2c83519768460189
diff --cc arch/arm/mach-iop13xx/io.c
index 851dc8f,b651af9..183dc8b
--- a/arch/arm/mach-iop13xx/io.c
+++ b/arch/arm/mach-iop13xx/io.c
@@@ -48,8 -67,14 +48,8 @@@ static void __iomem *__iop13xx_ioremap_
  				       (cookie - IOP13XX_PBI_LOWER_MEM_RA),
  				       size, mtype, __builtin_return_address(0));
  		break;
 -	case IOP13XX_PCIE_LOWER_IO_PA ... IOP13XX_PCIE_UPPER_IO_PA:
 -		retval = (void *) IOP13XX_PCIE_IO_PHYS_TO_VIRT(cookie);
 -		break;
 -	case IOP13XX_PCIX_LOWER_IO_PA ... IOP13XX_PCIX_UPPER_IO_PA:
 -		retval = (void *) IOP13XX_PCIX_IO_PHYS_TO_VIRT(cookie);
 -		break;
  	case IOP13XX_PMMR_PHYS_MEM_BASE ... IOP13XX_PMMR_UPPER_MEM_PA:
- 		retval = (void *) IOP13XX_PMMR_PHYS_TO_VIRT(cookie);
+ 		retval = IOP13XX_PMMR_PHYS_TO_VIRT(cookie);
  		break;
  	default:
  		retval = __arm_ioremap_caller(cookie, size, mtype,
@@@ -74,7 -99,9 +74,7 @@@ static void __iop13xx_iounmap(volatile 
  		    goto skip;
  
  	switch ((u32) addr) {
- 	case IOP13XX_PMMR_VIRT_MEM_BASE ... IOP13XX_PMMR_UPPER_MEM_VA:
 -	case (u32)IOP13XX_PCIE_LOWER_IO_VA ... (u32)IOP13XX_PCIE_UPPER_IO_VA:
 -	case (u32)IOP13XX_PCIX_LOWER_IO_VA ... (u32)IOP13XX_PCIX_UPPER_IO_VA:
+ 	case (u32)IOP13XX_PMMR_VIRT_MEM_BASE ... (u32)IOP13XX_PMMR_UPPER_MEM_VA:
  		goto skip;
  	}
  	__iounmap(addr);