From: Jörn Engel <joern@wohnheim.fh-wedel.de>
Date: Thu, 13 Apr 2006 16:53:55 +0000 (+0200)
Subject: Make mtdblock_ro unconditionally readonly
X-Git-Tag: v2.6.18-rc1~1105^2~152
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=af63a3bcac77d8c01f3d963bac11a6f3f9b7c473;p=~andy%2Flinux

Make mtdblock_ro unconditionally readonly

mtdblock_ro is by definition readonly.  Remove the silly checks.

Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/drivers/mtd/mtdblock_ro.c b/drivers/mtd/mtdblock_ro.c
index 0c830ba41ef..29563ed258a 100644
--- a/drivers/mtd/mtdblock_ro.c
+++ b/drivers/mtd/mtdblock_ro.c
@@ -45,9 +45,7 @@ static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 	dev->blksize = 512;
 	dev->size = mtd->size >> 9;
 	dev->tr = tr;
-	if ((mtd->flags & (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEABLE)) !=
-	    (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEABLE))
-		dev->readonly = 1;
+	dev->readonly = 1;
 
 	add_mtd_blktrans_dev(dev);
 }