mtd: cmdlinepart: Simplify parse_cmdline_partitions

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 <shmulik.ladkani@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

1 files changed, 42 insertions, 38 deletions

diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index aed1b8a63c9f..4baab3bc6136 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -308,48 +308,52 @@ 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 (part->parts[i].size == 0) {
-                                        printk(KERN_WARNING ERRP
-                                               "%s: skipping zero sized partition\n",
-                                               part->mtd_id);
-                                        part->num_parts--;
-                                        memmove(&part->parts[i],
-                                                &part->parts[i + 1],
-                                                sizeof(*part->parts) * (part->num_parts - i));
-                                        continue;
-                                }
-
-                                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;
-                                }
-                                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 (part->parts[i].size == 0) {
+                        printk(KERN_WARNING ERRP
+                               "%s: skipping zero sized partition\n",
+                               part->mtd_id);
+                        part->num_parts--;
+                        memmove(&part->parts[i], &part->parts[i + 1],
+                                sizeof(*part->parts) * (part->num_parts - i));
+                        continue;
                 }
+
+                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;
+                }
+                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;
 }