Merge branch 'master' into upstream-fixes

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index bc7cc71788bc..d1717763f719 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -62,7 +62,7 @@ static int physmap_flash_remove(struct platform_device *dev)
         }
 
         if (info->map.virt != NULL)
-                iounmap((void *)info->map.virt);
+                iounmap(info->map.virt);
 
         if (info->res != NULL) {
                 release_resource(info->res);
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index e0a1d386e581..94924d52a9b9 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -249,7 +249,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
         goto out;
 
 out_ior:
-        iounmap((void *)this->IO_ADDR_R);
+        iounmap(this->IO_ADDR_R);
 out_mtd:
         kfree(new_mtd);
 out: