mtd: mtdpart: Do not supply NULL to printf()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 13 Mar 2025 09:15:53 +0000 (11:15 +0200)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Tue, 18 Mar 2025 16:18:19 +0000 (17:18 +0100)
GCC compiler is not happy about NULL being supplied as printf() parameter:

drivers/mtd/mtdpart.c:693:34: error: ā€˜%s’ directive argument is null [-Werror=format-overflow=]

Move the code after the parser test for NULL, and drop the ternary completely.
The user can deduct this since when it's not NULL two messages will be printed.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
drivers/mtd/mtdpart.c

index 6811a714349d7f1014f7d8717c2db72e0b9b258c..994e8c51e67438eed5759720f10d5c37ce0c99b3 100644 (file)
@@ -690,10 +690,9 @@ int parse_mtd_partitions(struct mtd_info *master, const char *const *types,
                        parser = mtd_part_parser_get(*types);
                        if (!parser && !request_module("%s", *types))
                                parser = mtd_part_parser_get(*types);
-                       pr_debug("%s: got parser %s\n", master->name,
-                               parser ? parser->name : NULL);
                        if (!parser)
                                continue;
+                       pr_debug("%s: got parser %s\n", master->name, parser->name);
                        ret = mtd_part_do_parse(parser, master, &pparts, data);
                        if (ret <= 0)
                                mtd_part_parser_put(parser);