Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 112c61f7b8cd..f09c9319a2ba 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev)
                 IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE);
         __raw_writel(cr, adapter_data->ioaddr + CR_OFFSET);
 
-        iounmap((void __iomem*)adapter_data->ioaddr);
+        iounmap(adapter_data->ioaddr);
         release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);
         kfree(adapter_data);
         kfree(padapter);
@@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev)
         /* set the adapter enumeration # */
         adapter_data->id = i2c_id++;
 
-        adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE);
+        adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE);
         if (!adapter_data->ioaddr) {
                 ret = -ENOMEM;
                 goto release_region;
@@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev)
         return 0;
 
 unmap:
-        iounmap((void __iomem*)adapter_data->ioaddr);
+        iounmap(adapter_data->ioaddr);
 
 release_region:
         release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);