OMAP: Remove flash unlocking from the mapping driver

Since commit 'e619a75ff6201b56' every MTD partition can
be marked with MTD_POWERUP_LOCK flag  which means the partition
will be unlocked upon kernel bootup. By default all
Intel's chips with instant individual block locking feature
have MTD_POWERUP_FLAG set. So we do not need to unlock
the flash in the mapping driver anymore.

Signed-off-by: Dmitry Krivoschekov <dmitry.krivoschekov@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index d72cc114a38cdca1bd4dcd4d30d7e7a019f57871..a1342a2a1cb976d9e739020ddfd1a108fa713073 100644 (file)
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -108,10 +108,6 @@ static int __devinit omapflash_probe(struct platform_device *pdev)
        }
        info->mtd->owner = THIS_MODULE;
 
-       /* Unlock the flash device. */
-       if (info->mtd->unlock)
-               info->mtd->unlock(info->mtd, 0, info->mtd->size);
-
 #ifdef CONFIG_MTD_PARTITIONS
        err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0);
        if (err > 0)