4 files changed, 13 insertions, 29 deletions

diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c
index 01af34778de3..934a72c80078 100644
--- a/drivers/mtd/maps/scb2_flash.c
+++ b/drivers/mtd/maps/scb2_flash.c
@@ -204,8 +204,7 @@ scb2_flash_remove(struct pci_dev *dev)
                 return;
 
         /* disable flash writes */
-        if (scb2_mtd->lock)
-                mtd_lock(scb2_mtd, 0, scb2_mtd->size);
+        mtd_lock(scb2_mtd, 0, scb2_mtd->size);
 
         mtd_device_unregister(scb2_mtd);
         map_destroy(scb2_mtd);
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 23a51104aeb5..92da621b1425 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -814,10 +814,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
                 if (copy_from_user(&einfo, argp, sizeof(einfo)))
                         return -EFAULT;
 
-                if (!mtd->lock)
-                        ret = -EOPNOTSUPP;
-                else
-                        ret = mtd_lock(mtd, einfo.start, einfo.length);
+                ret = mtd_lock(mtd, einfo.start, einfo.length);
                 break;
         }
 
@@ -828,10 +825,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
                 if (copy_from_user(&einfo, argp, sizeof(einfo)))
                         return -EFAULT;
 
-                if (!mtd->unlock)
-                        ret = -EOPNOTSUPP;
-                else
-                        ret = mtd_unlock(mtd, einfo.start, einfo.length);
+                ret = mtd_unlock(mtd, einfo.start, einfo.length);
                 break;
         }
 
@@ -842,10 +836,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
                 if (copy_from_user(&einfo, argp, sizeof(einfo)))
                         return -EFAULT;
 
-                if (!mtd->is_locked)
-                        ret = -EOPNOTSUPP;
-                else
-                        ret = mtd_is_locked(mtd, einfo.start, einfo.length);
+                ret = mtd_is_locked(mtd, einfo.start, einfo.length);
                 break;
         }
 
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 9119f76f87ff..aaafb5e18765 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -555,12 +555,9 @@ static int concat_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
                 else
                         size = len;
 
-                if (subdev->lock) {
-                        err = mtd_lock(subdev, ofs, size);
-                        if (err)
-                                break;
-                } else
-                        err = -EOPNOTSUPP;
+                err = mtd_lock(subdev, ofs, size);
+                if (err)
+                        break;
 
                 len -= size;
                 if (len == 0)
@@ -595,12 +592,9 @@ static int concat_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
                 else
                         size = len;
 
-                if (subdev->unlock) {
-                        err = mtd_unlock(subdev, ofs, size);
-                        if (err)
-                                break;
-                } else
-                        err = -EOPNOTSUPP;
+                err = mtd_unlock(subdev, ofs, size);
+                if (err)
+                        break;
 
                 len -= size;
                 if (len == 0)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 4d0f3e557bd1..66494ee5355a 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -339,9 +339,9 @@ int add_mtd_device(struct mtd_info *mtd)
         mtd->writesize_mask = (1 << mtd->writesize_shift) - 1;
 
         /* Some chips always power up locked. Unlock them now */
-        if ((mtd->flags & MTD_WRITEABLE)
-            && (mtd->flags & MTD_POWERUP_LOCK) && mtd->unlock) {
-                if (mtd_unlock(mtd, 0, mtd->size))
+        if ((mtd->flags & MTD_WRITEABLE) && (mtd->flags & MTD_POWERUP_LOCK)) {
+                error = mtd_unlock(mtd, 0, mtd->size);
+                if (error && error != -EOPNOTSUPP)
                         printk(KERN_WARNING
                                "%s: unlock failed, writes may not work\n",
                                mtd->name);