Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Chris Packham <chris.packham@alliedtelesis.co.nz>
To:     dwmw2@infradead.org, computersforpeace@gmail.com,
        marek.vasut@gmail.com, miquel.raynal@bootlin.com, richard@nod.at,
        vigneshr@ti.com
Cc:     linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
        Chris Packham <chris.packham@alliedtelesis.co.nz>
Subject: [PATCH 1/2] mtd: concat: refactor concat_lock/concat_unlock
Date:   Wed, 22 May 2019 12:07:52 +1200
Message-Id: <20190522000753.13300-1-chris.packham@alliedtelesis.co.nz>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

concat_lock() and concat_unlock() only differed in terms of the mtd_xx
operation they called. Refactor them to use a common helper function and
pass mtd_lock or mtd_unlock as an argument.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
 drivers/mtd/mtdconcat.c | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index cbc5925e6440..9514cd2db63c 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -451,7 +451,8 @@ static int concat_erase(struct mtd_info *mtd, struct =
erase_info *instr)
 	return err;
 }
=20
-static int concat_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+static int __concat_xxlock(struct mtd_info *mtd, loff_t ofs, uint64_t le=
n,
+			   int (*mtd_op)(struct mtd_info *mtd, loff_t ofs, uint64_t len))
 {
 	struct mtd_concat *concat =3D CONCAT(mtd);
 	int i, err =3D -EINVAL;
@@ -470,7 +471,7 @@ static int concat_lock(struct mtd_info *mtd, loff_t o=
fs, uint64_t len)
 		else
 			size =3D len;
=20
-		err =3D mtd_lock(subdev, ofs, size);
+		err =3D mtd_op(subdev, ofs, size);
 		if (err)
 			break;
=20
@@ -485,38 +486,14 @@ static int concat_lock(struct mtd_info *mtd, loff_t=
 ofs, uint64_t len)
 	return err;
 }
=20
-static int concat_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+static int concat_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 {
-	struct mtd_concat *concat =3D CONCAT(mtd);
-	int i, err =3D 0;
-
-	for (i =3D 0; i < concat->num_subdev; i++) {
-		struct mtd_info *subdev =3D concat->subdev[i];
-		uint64_t size;
-
-		if (ofs >=3D subdev->size) {
-			size =3D 0;
-			ofs -=3D subdev->size;
-			continue;
-		}
-		if (ofs + len > subdev->size)
-			size =3D subdev->size - ofs;
-		else
-			size =3D len;
-
-		err =3D mtd_unlock(subdev, ofs, size);
-		if (err)
-			break;
-
-		len -=3D size;
-		if (len =3D=3D 0)
-			break;
-
-		err =3D -EINVAL;
-		ofs =3D 0;
-	}
+	return __concat_xxlock(mtd, ofs, len, mtd_lock);
+}
=20
-	return err;
+static int concat_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
+{
+	return __concat_xxlock(mtd, ofs, len, mtd_unlock);
 }
=20
 static void concat_sync(struct mtd_info *mtd)
--=20
2.21.0