aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/mtdconcat.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2011-12-30 10:00:35 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-01-09 13:26:22 -0500
commit381345652fca688aeaa967c231e5075cf68d05b6 (patch)
tree5f23ecdd28165d15109c6fd7ad0c4c573f094707 /drivers/mtd/mtdconcat.c
parent327cf2922b4edf0439b219469722d2a502e37349 (diff)
mtd: do not use mtd->lock, unlock and is_locked directly
Instead, call the corresponding MTD API function which will return '-EOPNOTSUPP' if the operation is not supported. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/mtdconcat.c')
-rw-r--r--drivers/mtd/mtdconcat.c18
1 files changed, 6 insertions, 12 deletions
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)
555 else 555 else
556 size = len; 556 size = len;
557 557
558 if (subdev->lock) { 558 err = mtd_lock(subdev, ofs, size);
559 err = mtd_lock(subdev, ofs, size); 559 if (err)
560 if (err) 560 break;
561 break;
562 } else
563 err = -EOPNOTSUPP;
564 561
565 len -= size; 562 len -= size;
566 if (len == 0) 563 if (len == 0)
@@ -595,12 +592,9 @@ static int concat_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
595 else 592 else
596 size = len; 593 size = len;
597 594
598 if (subdev->unlock) { 595 err = mtd_unlock(subdev, ofs, size);
599 err = mtd_unlock(subdev, ofs, size); 596 if (err)
600 if (err) 597 break;
601 break;
602 } else
603 err = -EOPNOTSUPP;
604 598
605 len -= size; 599 len -= size;
606 if (len == 0) 600 if (len == 0)