mtd: maps: physmap: Invert logic on if/else branch

It is preferred to have the positive statement on an if/else. While we
are at it we replace the way we access rom_probe_types.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index 11e6239aadc71fead8d9e5b7285e8be2647cd37c..e8c3b250d8421edc416a4c8280d601e9755a9238 100644 (file)
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -396,7 +396,7 @@ static int physmap_flash_of_init(struct platform_device *dev)
 #endif /* IS_ENABLED(CONFIG_MTD_PHYSMAP_OF) */
 
 static const char * const rom_probe_types[] = {
-       "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL
+       "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom",
 };
 
 static const char * const part_probe_types[] = {
@@ -437,7 +437,6 @@ static int physmap_flash_pdata_init(struct platform_device *dev)
 static int physmap_flash_probe(struct platform_device *dev)
 {
        struct physmap_flash_info *info;
-       const char * const *probe_type;
        int err = 0;
        int i;
 
@@ -519,14 +518,18 @@ static int physmap_flash_probe(struct platform_device *dev)
                        simple_map_init(&info->maps[i]);
                }
 
-               probe_type = rom_probe_types;
-               if (!info->probe_type) {
-                       for (; !info->mtds[i] && *probe_type; probe_type++)
-                               info->mtds[i] = do_map_probe(*probe_type,
-                                                            &info->maps[i]);
-               } else {
+               if (info->probe_type) {
                        info->mtds[i] = do_map_probe(info->probe_type,
                                                     &info->maps[i]);
+               } else {
+                       int j;
+
+                       for (j = 0; j < ARRAY_SIZE(rom_probe_types); j++) {
+                               info->mtds[i] = do_map_probe(rom_probe_types[j],
+                                                            &info->maps[i]);
+                               if (info->mtds[i])
+                                       break;
+                       }
                }
 
                if (!info->mtds[i]) {