Commit 99f732b3 authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Boris Brezillon
Browse files

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: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ba32ce95

drivers/mtd/maps/physmap-core.c

+11 −8
Original line number Diff line number Diff line
@@ -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,

		if (info->probe_type) {

			info->mtds[i] = do_map_probe(info->probe_type,

						     &info->maps[i]);

		} else {

			info->mtds[i] = do_map_probe(info->probe_type,

			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]) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE