From: Rafał Miłecki <zajec5@gmail.com>
Date: Sun, 6 Jan 2013 15:08:35 +0000 (+0100)
Subject: mtd: bcm47xxpart: simplify size calculation to one loop
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=648bdbee5d2cc3ff27370d05e7577ade8496bfd0;p=deliverable%2Flinux.git

mtd: bcm47xxpart: simplify size calculation to one loop

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index e06d782489a6..06125eb59f14 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -169,11 +169,12 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 	 * Assume that partitions end at the beginning of the one they are
 	 * followed by.
 	 */
-	for (i = 0; i < curr_part - 1; i++)
-		parts[i].size = parts[i + 1].offset - parts[i].offset;
-	if (curr_part > 0)
-		parts[curr_part - 1].size =
-				master->size - parts[curr_part - 1].offset;
+	for (i = 0; i < curr_part; i++) {
+		u64 next_part_offset = (i < curr_part - 1) ?
+				       parts[i + 1].offset : master->size;
+
+		parts[i].size = next_part_offset - parts[i].offset;
+	}
 
 	*pparts = parts;
 	return curr_part;