Skip to contentSkip to conversation

mtd: parsers: ofpart: Remove code/data for disabled custom parsers

PATCH Applied Daniel Palmer 2 participants 2 messages Jan 4 – Jan 19 Memory technology devices (MTD)

lore
Share & tools
lore

Daniel Palmer

author
#0 lore raw

PATCH 1/1 mtd: parsers: ofpart: Remove code/data for disabled custom parsers

Currently even if none of the custom parsers are selected a struct of_device_id and a dummy function that just returns -EOPNOTSUPP is compiled in for each of them.

Its not obvious from the code but struct of_device_id is massive, 196 or 200 bytes (see link), so this is a lot more wasteful than you'd think just skimming the code and assuming the wasted size is just the length of the string with some small overhead.

If they aren't enabled use ifdef's to avoid anything being compiled in and remove the dummy functions.

Link https://lore.kernel.org/all/ef59d6fd3b2201b912d5eaa7f7a037d8f9adb744.1636561068.git.geert+renesas@glider.be/ open here
Signed-off-by Daniel Palmer <[email protected]>
---
 drivers/mtd/parsers/ofpart_bcm4908.h    | 6 ------
 drivers/mtd/parsers/ofpart_core.c       | 8 ++++++++
 drivers/mtd/parsers/ofpart_linksys_ns.h | 7 -------
 3 files changed, 8 insertions(+), 13 deletions(-)
drivers/mtd/parsers/ofpart_bcm4908.h +0 -6
index 80f8c086641f..f96dcd5275a7 100644
@@ -4,12 +4,6 @@
 
 #ifdef CONFIG_MTD_OF_PARTS_BCM4908
 int bcm4908_partitions_post_parse(struct mtd_info *mtd, struct mtd_partition *parts, int nr_parts);
-#else
-static inline int bcm4908_partitions_post_parse(struct mtd_info *mtd, struct mtd_partition *parts,
-						int nr_parts)
-{
-	return -EOPNOTSUPP;
-}
 #endif
 
 #endif
drivers/mtd/parsers/ofpart_core.c +8 -0
index abfa68798918..e04eee028f63 100644
@@ -23,13 +23,17 @@ struct fixed_partitions_quirks {
 	int (*post_parse)(struct mtd_info *mtd, struct mtd_partition *parts, int nr_parts);
 };
 
+#ifdef CONFIG_MTD_OF_PARTS_BCM4908
 static struct fixed_partitions_quirks bcm4908_partitions_quirks = {
 	.post_parse = bcm4908_partitions_post_parse,
 };
+#endif
 
+#ifdef CONFIG_MTD_OF_PARTS_LINKSYS_NS
 static struct fixed_partitions_quirks linksys_ns_partitions_quirks = {
 	.post_parse = linksys_ns_partitions_post_parse,
 };
+#endif
 
 static const struct of_device_id parse_ofpart_match_table[];
 

@@ -192,8 +196,12 @@ static const struct of_device_id parse_ofpart_match_table[] = {
 	/* Generic */
 	{ .compatible = "fixed-partitions" },
 	/* Customized */
+#ifdef CONFIG_MTD_OF_PARTS_BCM4908
 	{ .compatible = "brcm,bcm4908-partitions", .data = &bcm4908_partitions_quirks, },
+#endif
+#ifdef CONFIG_MTD_OF_PARTS_LINKSYS_NS
 	{ .compatible = "linksys,ns-partitions", .data = &linksys_ns_partitions_quirks, },
+#endif
 	{},
 };
 MODULE_DEVICE_TABLE(of, parse_ofpart_match_table);
drivers/mtd/parsers/ofpart_linksys_ns.h +0 -7
index 730c46812ebf..6537aa37c0aa 100644
@@ -6,13 +6,6 @@
 int linksys_ns_partitions_post_parse(struct mtd_info *mtd,
 				     struct mtd_partition *parts,
 				     int nr_parts);
-#else
-static inline int linksys_ns_partitions_post_parse(struct mtd_info *mtd,
-						   struct mtd_partition *parts,
-						   int nr_parts)
-{
-	return -EOPNOTSUPP;
-}
 #endif
 
 #endif
Signature · 1 line
2.51.0
maintainer Applied
#1 lore raw
Quoted 10 lines · Daniel Palmer

Currently even if none of the custom parsers are selected a struct of_device_id and a dummy function that just returns -EOPNOTSUPP is compiled in for each of them.

Its not obvious from the code but struct of_device_id is massive, 196 or 200 bytes (see link), so this is a lot more wasteful than you'd think just skimming the code and assuming the wasted size is just the length of the string with some small overhead.

[...]

Applied to mtd/next, thanks!

[1/1] mtd: parsers: ofpart: Remove code/data for disabled custom parsers

      commit: 56477aea482dd81e0364d98a02ab805d24242b72

Patche(s) should be available on mtd/linux.git and will be part of the next PR (provided that no robot complains by then).

Kind regards,
Miquèl