mtd: cmdlinepart: Simplify parse_cmdline_partitions

PATCH Superseded Shmulik Ladkani 1 participant 1 message Sep 5, 2012 Memory technology devices (MTD)

lore

Share & tools

lore

Shmulik Ladkani

author

2012-09-05 05:58 UTC #0 lore raw

PATCH 1/1 mtd: cmdlinepart: Simplify parse_cmdline_partitions

From: Shmulik Ladkani <[email protected]>

Simply 'parse_cmdline_partitions': the outer loop iterating over 'partitions' is actually a search loop, it does not execute the inner loop for each partition, only for the matched partition.

Let's break when search is successful, and move all inner code (relevant only for the matched partition) outside of the outer loop.

Resulting code is much more readable, and makes the indent level sane.

Signed-off-by Shmulik Ladkani <[email protected]>

---
- (should be) coding fix only, semantics aren't changed
- sorry, didn't even compile tested, please verify this is sane, thanks

drivers/mtd/cmdlinepart.c +34 ~~-28~~

index 17b0bd4..46951d7 100644
@@ -308,38 +308,44 @@ static int parse_cmdline_partitions(struct mtd_info *master,
 			return err;
 	}
 
+	/*
+	 * Search for the partition definition matching master->name.
+	 * If master->name is not set, stop at first partition definition.
+	 */
 	for (part = partitions; part; part = part->next) {
-		if ((!mtd_id) || (!strcmp(part->mtd_id, mtd_id))) {
-			for (i = 0, offset = 0; i < part->num_parts; i++) {
-				if (part->parts[i].offset == OFFSET_CONTINUOUS)
-					part->parts[i].offset = offset;
-				else
-					offset = part->parts[i].offset;
-
-				if (part->parts[i].size == SIZE_REMAINING)
-					part->parts[i].size = master->size - offset;
-
-				if (offset + part->parts[i].size > master->size) {
-					printk(KERN_WARNING ERRP
-					       "%s: partitioning exceeds flash size, truncating\n",
-					       part->mtd_id);
-					part->parts[i].size = master->size - offset;
-					part->num_parts = i;
-				}
-				offset += part->parts[i].size;
-			}
-
-			*pparts = kmemdup(part->parts,
-					sizeof(*part->parts) * part->num_parts,
-					GFP_KERNEL);
-			if (!*pparts)
-				return -ENOMEM;
-
-			return part->num_parts;
+		if ((!mtd_id) || (!strcmp(part->mtd_id, mtd_id)))
+			break;
+	}
+
+	if (!part)
+		return 0;
+
+	for (i = 0, offset = 0; i < part->num_parts; i++) {
+		if (part->parts[i].offset == OFFSET_CONTINUOUS)
+			part->parts[i].offset = offset;
+		else
+			offset = part->parts[i].offset;
+
+		if (part->parts[i].size == SIZE_REMAINING)
+			part->parts[i].size = master->size - offset;
+
+		if (offset + part->parts[i].size > master->size) {
+			printk(KERN_WARNING ERRP
+					"%s: partitioning exceeds flash size, truncating\n",
+					part->mtd_id);
+			part->parts[i].size = master->size - offset;
+			part->num_parts = i;
 		}
+		offset += part->parts[i].size;
 	}
 
-	return 0;
+	*pparts = kmemdup(part->parts,
+			sizeof(*part->parts) * part->num_parts,
+			GFP_KERNEL);
+	if (!*pparts)
+		return -ENOMEM;
+
+	return part->num_parts;
 }