From: Dmitry Krivoschekov Date: Fri, 15 Feb 2008 13:51:56 +0000 (+0300) Subject: OMAP: Remove flash unlocking from the mapping driver X-Git-Tag: v2.6.25-omap1~190 X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=c4ac0af27c2cd824b8e7ca28d635b0f1027dec8e;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Tony Lindgren --- diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c index d72cc114a38..a1342a2a1cb 100644 --- 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)