[ARM] Drivers should not make use of architecture private __ioremap

__ioremap is an architecture private interface and must not be used
by drivers when the architecture independent interface will do just
as well.  Switch the ipaq drivers to use the correct interface.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c
index 35097c9bbf50c5bb560fe5fce3b039a3a4c4eba3..b8ccb0a9578984221c5ad3caad30ee3caa9d03d3 100644 (file)
--- 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/nand/h1910.c b/drivers/mtd/nand/h1910.c
index 041e4b3358fbce2d953ef14d77e4c5e9e609e048..f68f7a99a6309bafb051d76b634654f52c0bbe7e 100644 (file)
--- 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;