1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-iop13xx/io.c b/arch/arm/mach-iop13xx/io.c
index 3c364198db9c..b651af966b57 100644
--- a/arch/arm/mach-iop13xx/io.c
+++ b/arch/arm/mach-iop13xx/io.c
@@ -52,14 +52,14 @@ static void __iomem *__iop13xx_ioremap_caller(unsigned long cookie,
                 if (unlikely(!iop13xx_atux_mem_base))
                         retval = NULL;
                 else
-                        retval = (void *)(iop13xx_atux_mem_base +
+                        retval = (iop13xx_atux_mem_base +
                                  (cookie - IOP13XX_PCIX_LOWER_MEM_RA));
                 break;
         case IOP13XX_PCIE_LOWER_MEM_RA ... IOP13XX_PCIE_UPPER_MEM_RA:
                 if (unlikely(!iop13xx_atue_mem_base))
                         retval = NULL;
                 else
-                        retval = (void *)(iop13xx_atue_mem_base +
+                        retval = (iop13xx_atue_mem_base +
                                  (cookie - IOP13XX_PCIE_LOWER_MEM_RA));
                 break;
         case IOP13XX_PBI_LOWER_MEM_RA ... IOP13XX_PBI_UPPER_MEM_RA:
@@ -74,7 +74,7 @@ static void __iomem *__iop13xx_ioremap_caller(unsigned long cookie,
                 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,
@@ -99,9 +99,9 @@ static void __iop13xx_iounmap(volatile void __iomem *addr)
                     goto skip;
 
         switch ((u32) addr) {
-        case IOP13XX_PCIE_LOWER_IO_VA ... IOP13XX_PCIE_UPPER_IO_VA:
-        case IOP13XX_PCIX_LOWER_IO_VA ... IOP13XX_PCIX_UPPER_IO_VA:
-        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);