3 files changed, 15 insertions, 15 deletions

diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c
index 35097c9bbf..b8ccb0a957 100644
--- a/drivers/mtd/maps/ipaq-flash.c
+++ b/drivers/mtd/maps/ipaq-flash.c
@@ -246,7 +246,7 @@ int __init ipaq_mtd_init(void)
                         ipaq_map[i].size = h3xxx_max_flash_size;
                         ipaq_map[i].set_vpp = h3xxx_set_vpp;
                         ipaq_map[i].phys = cs_phys[i];
-                        ipaq_map[i].virt = __ioremap(cs_phys[i], 0x04000000, 0, 1);
+                        ipaq_map[i].virt = ioremap(cs_phys[i], 0x04000000);
                         if (machine_is_h3100 () || machine_is_h1900())
                                 ipaq_map[i].bankwidth = 2;
                 }
@@ -280,7 +280,7 @@ int __init ipaq_mtd_init(void)
                 nb_parts = ARRAY_SIZE(jornada_partitions);
                 ipaq_map[0].size = jornada_max_flash_size;
                 ipaq_map[0].set_vpp = jornada56x_set_vpp;
-                ipaq_map[0].virt = (__u32)__ioremap(0x0, 0x04000000, 0, 1);
+                ipaq_map[0].virt = (__u32)ioremap(0x0, 0x04000000);
         }
 #endif
 #ifdef CONFIG_SA1100_JORNADA720
@@ -442,7 +442,7 @@ static int __init h1900_special_case(void)
         ipaq_map[0].size = 0x80000;
         ipaq_map[0].set_vpp = h3xxx_set_vpp;
         ipaq_map[0].phys = 0x0;
-        ipaq_map[0].virt = __ioremap(0x0, 0x04000000, 0, 1);
+        ipaq_map[0].virt = ioremap(0x0, 0x04000000);
         ipaq_map[0].bankwidth = 2;
 
         printk(KERN_NOTICE "iPAQ flash: probing %d-bit flash bus, window=%lx with JEDEC.\n", ipaq_map[0].bankwidth*8, ipaq_map[0].virt);
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index fc7a78e317..2c9cc7f37e 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -159,12 +159,12 @@ static int ixp2000_flash_probe(struct platform_device *dev)
                 return -ENODEV;
 
         window_size = dev->resource->end - dev->resource->start + 1;
-        dev_info(_dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
-                        ixp_data->nr_banks, ((u32)window_size >> 20));
+        dev_info(&dev->dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
+                 ixp_data->nr_banks, ((u32)window_size >> 20));
 
         if (plat->width != 1) {
-                dev_err(_dev, "IXP2000 MTD map only supports 8-bit mode, asking for %d\n",
-                                plat->width * 8);
+                dev_err(&dev->dev, "IXP2000 MTD map only supports 8-bit mode, asking for %d\n",
+                        plat->width * 8);
                 return -EIO;
         }
 
@@ -202,7 +202,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
                         dev->resource->end - dev->resource->start + 1,
                         dev->dev.bus_id);
         if (!info->res) {
-                dev_err(_dev, "Could not reserve memory region\n");
+                dev_err(&dev->dev, "Could not reserve memory region\n");
                 err = -ENOMEM;
                 goto Error;
         }
@@ -210,7 +210,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
         info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start,
                                 dev->resource->end - dev->resource->start + 1);
         if (!info->map.map_priv_1) {
-                dev_err(_dev, "Failed to ioremap flash region\n");
+                dev_err(&dev->dev, "Failed to ioremap flash region\n");
                 err = -EIO;
                 goto Error;
         }
@@ -221,13 +221,13 @@ static int ixp2000_flash_probe(struct platform_device *dev)
          */
 
         erratum44_workaround = ixp2000_has_broken_slowport();
-        dev_info(_dev, "Erratum 44 workaround %s\n",
+        dev_info(&dev->dev, "Erratum 44 workaround %s\n",
                erratum44_workaround ? "enabled" : "disabled");
 #endif
 
         info->mtd = do_map_probe(plat->map_name, &info->map);
         if (!info->mtd) {
-                dev_err(_dev, "map_probe failed\n");
+                dev_err(&dev->dev, "map_probe failed\n");
                 err = -ENXIO;
                 goto Error;
         }
@@ -237,7 +237,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
         if (err > 0) {
                 err = add_mtd_partitions(info->mtd, info->partitions, err);
                 if(err)
-                        dev_err(_dev, "Could not parse partitions\n");
+                        dev_err(&dev->dev, "Could not parse partitions\n");
         }
 
         if (err)
@@ -251,8 +251,8 @@ Error:
 }
 
 static struct platform_driver ixp2000_flash_driver = {
-        .probe          = &ixp2000_flash_probe,
-        .remove         = &ixp2000_flash_remove
+        .probe          = ixp2000_flash_probe,
+        .remove         = ixp2000_flash_remove,
         .driver         = {
                 .name   = "IXP2000-Flash",
         },
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index 041e4b3358..f68f7a99a6 100644
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -112,7 +112,7 @@ static int __init h1910_init (void)
         if (!machine_is_h1900())
                 return -ENODEV;
 
-        nandaddr = __ioremap(0x08000000, 0x1000, 0, 1);
+        nandaddr = ioremap(0x08000000, 0x1000);
         if (!nandaddr) {
                 printk("Failed to ioremap nand flash.\n");
                 return -ENOMEM;