mtd: autcpu12-nvram: Fix compile breakage

commit d1f55c680e5d021e7066f4461dd678d42af18898 upstream.

Update driver autcpu12-nvram.c so it compiles; map_read32/map_write32
no longer exist in the kernel so the driver is totally broken.
Additionally, map_info name passed to simple_map_init is incorrect.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index e5bfd0e093bb1e20e0336f84e69eb7058dc7a822..0598d52eaf9f983ca28efbac6ffba400e6de98b0 100644 (file)
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -43,7 +43,8 @@ struct map_info autcpu12_sram_map = {
 
 static int __init init_autcpu12_sram (void)
 {
-       int err, save0, save1;
+       map_word tmp, save0, save1;
+       int err;
 
        autcpu12_sram_map.virt = ioremap(0x12000000, SZ_128K);
        if (!autcpu12_sram_map.virt) {
@@ -51,7 +52,7 @@ static int __init init_autcpu12_sram (void)
                err = -EIO;
                goto out;
        }
-       simple_map_init(&autcpu_sram_map);
+       simple_map_init(&autcpu12_sram_map);
 
        /*
         * Check for 32K/128K
@@ -61,20 +62,22 @@ static int __init init_autcpu12_sram (void)
         * Read and check result on ofs 0x0
         * Restore contents
         */
-       save0 = map_read32(&autcpu12_sram_map,0);
-       save1 = map_read32(&autcpu12_sram_map,0x10000);
-       map_write32(&autcpu12_sram_map,~save0,0x10000);
+       save0 = map_read(&autcpu12_sram_map, 0);
+       save1 = map_read(&autcpu12_sram_map, 0x10000);
+       tmp.x[0] = ~save0.x[0];
+       map_write(&autcpu12_sram_map, tmp, 0x10000);
        /* if we find this pattern on 0x0, we have 32K size
         * restore contents and exit
         */
-       if ( map_read32(&autcpu12_sram_map,0) != save0) {
-               map_write32(&autcpu12_sram_map,save0,0x0);
+       tmp = map_read(&autcpu12_sram_map, 0);
+       if (!map_word_equal(&autcpu12_sram_map, tmp, save0)) {
+               map_write(&autcpu12_sram_map, save0, 0x0);
                goto map;
        }
        /* We have a 128K found, restore 0x10000 and set size
         * to 128K
         */
-       map_write32(&autcpu12_sram_map,save1,0x10000);
+       map_write(&autcpu12_sram_map, save1, 0x10000);
        autcpu12_sram_map.size = SZ_128K;
 
 map: