Merge branches 'misc', 'drv_cleanup', 'devm-cleanup' and 'ti-soc' of .git into next

[karo-tx-linux.git] / drivers / mtd / chips / map_ram.c

diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c
index 67640ccb2d4168d959de0f3c3d9c9b573f029923..991c2a1c05d364f33ac72cee2164f0ba6567e554 100644 (file)
--- a/drivers/mtd/chips/map_ram.c
+++ b/drivers/mtd/chips/map_ram.c
@@ -64,11 +64,11 @@ static struct mtd_info *map_ram_probe(struct map_info *map)
        mtd->name = map->name;
        mtd->type = MTD_RAM;
        mtd->size = map->size;
-       mtd->erase = mapram_erase;
-       mtd->get_unmapped_area = mapram_unmapped_area;
-       mtd->read = mapram_read;
-       mtd->write = mapram_write;
-       mtd->sync = mapram_nop;
+       mtd->_erase = mapram_erase;
+       mtd->_get_unmapped_area = mapram_unmapped_area;
+       mtd->_read = mapram_read;
+       mtd->_write = mapram_write;
+       mtd->_sync = mapram_nop;
        mtd->flags = MTD_CAP_RAM;
        mtd->writesize = 1;
 
@@ -122,14 +122,10 @@ static int mapram_erase (struct mtd_info *mtd, struct erase_info *instr)
        unsigned long i;
 
        allff = map_word_ff(map);
-
        for (i=0; i<instr->len; i += map_bankwidth(map))
                map_write(map, allff, instr->addr + i);
-
        instr->state = MTD_ERASE_DONE;
-
        mtd_erase_callback(instr);
-
        return 0;
 }