[PATCH 01/16] boot: change bootentry_register_provider to take struct argument

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

bootentry_register_provider currently takes a single argument only:
The callback. To allow for an easier future extension, have it take a
struct instead.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/boards/protonic-imx6/board.c | 10 +++++++---
 common/blspec.c                       |  8 ++++++--
 common/boot.c                         | 17 +++--------------
 common/bootchooser.c                  |  6 +++++-
 include/boot.h                        |  8 +++++++-
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
index 0bbabbb8c734..7aa026594cc7 100644
--- a/arch/arm/boards/protonic-imx6/board.c
+++ b/arch/arm/boards/protonic-imx6/board.c
@@ -440,8 +440,8 @@ static int prt_imx6_bootentry_create(struct bootentries *bootentries, const char
 	return 0;
 }
 
-static int prt_imx6_bootentry_provider(struct bootentries *bootentries,
-				     const char *name)
+static int prt_imx6_bootentry_generate(struct bootentries *bootentries,
+				       const char *name)
 {
 	int found = 0;
 	unsigned int v;
@@ -459,6 +459,10 @@ static int prt_imx6_bootentry_provider(struct bootentries *bootentries,
 	return found;
 }
 
+static struct bootentry_provider prt_imx6_bootentry_provider = {
+	.generate = prt_imx6_bootentry_generate,
+};
+
 static int prt_imx6_env_init(struct prt_imx6_priv *priv)
 {
 	const struct prt_machine_data *dcfg = priv->dcfg;
@@ -568,7 +572,7 @@ static int prt_imx6_devices_init(void)
 	if (prt_imx6_read_ocotp_serial(priv) != 0)
 		prt_imx6_read_i2c_mac_serial(priv);
 
-	bootentry_register_provider(prt_imx6_bootentry_provider);
+	bootentry_register_provider(&prt_imx6_bootentry_provider);
 
 	prt_imx6_env_init(priv);
 
diff --git a/common/blspec.c b/common/blspec.c
index 77ae3dc21951..27ac6560b97b 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -788,7 +788,7 @@ int blspec_scan_devicename(struct bootentries *bootentries, const char *devname)
 	return blspec_scan_device(bootentries, dev);
 }
 
-static int blspec_bootentry_provider(struct bootentries *bootentries,
+static int blspec_bootentry_generate(struct bootentries *bootentries,
 				     const char *name)
 {
 	struct stat s;
@@ -822,8 +822,12 @@ static int blspec_bootentry_provider(struct bootentries *bootentries,
 	return found;
 }
 
+static struct bootentry_provider blspec_bootentry_provider = {
+	.generate = blspec_bootentry_generate,
+};
+
 static int blspec_init(void)
 {
-	return bootentry_register_provider(blspec_bootentry_provider);
+	return bootentry_register_provider(&blspec_bootentry_provider);
 }
 device_initcall(blspec_init);
diff --git a/common/boot.c b/common/boot.c
index 2530a5bbeeac..e3bdfec581c1 100644
--- a/common/boot.c
+++ b/common/boot.c
@@ -267,20 +267,9 @@ static int bootscript_scan_path(struct bootentries *bootentries, const char *pat
 
 static LIST_HEAD(bootentry_providers);
 
-struct bootentry_provider {
-	int (*fn)(struct bootentries *bootentries, const char *name);
-	struct list_head list;
-};
-
-int bootentry_register_provider(int (*fn)(struct bootentries *bootentries, const char *name))
+int bootentry_register_provider(struct bootentry_provider *p)
 {
-	struct bootentry_provider *p;
-
-	p = xzalloc(sizeof(*p));
-	p->fn = fn;
-
-	list_add_tail(&p->list, &bootentry_providers);
-
+	list_add(&p->list, &bootentry_providers);
 	return 0;
 }
 
@@ -306,7 +295,7 @@ int bootentry_create_from_name(struct bootentries *bootentries,
 	int found = 0, ret;
 
 	list_for_each_entry(p, &bootentry_providers, list) {
-		ret = p->fn(bootentries, name);
+		ret = p->generate(bootentries, name);
 		if (ret > 0)
 			found += ret;
 	}
diff --git a/common/bootchooser.c b/common/bootchooser.c
index 6c324fb155e4..bc7c47ec87ae 100644
--- a/common/bootchooser.c
+++ b/common/bootchooser.c
@@ -927,6 +927,10 @@ static int bootchooser_add_entry(struct bootentries *entries, const char *name)
 	return 1;
 }
 
+static struct bootentry_provider bootchooser_entry_provider = {
+	.generate = bootchooser_add_entry,
+};
+
 static const char * const reset_attempts_names[] = {
 	[RESET_ATTEMPTS_POWER_ON] = "power-on",
 	[RESET_ATTEMPTS_ALL_ZERO] = "all-zero",
@@ -953,7 +957,7 @@ static int bootchooser_init(void)
 	globalvar_add_simple_bitmask("bootchooser.reset_priorities", &reset_priorities,
 				  reset_priorities_names, ARRAY_SIZE(reset_priorities_names));
 
-	bootentry_register_provider(bootchooser_add_entry);
+	bootentry_register_provider(&bootchooser_entry_provider);
 
 	return 0;
 }
diff --git a/include/boot.h b/include/boot.h
index 53ad1360a5f3..8afbee6549c6 100644
--- a/include/boot.h
+++ b/include/boot.h
@@ -37,7 +37,13 @@ struct bootentry {
 
 int bootentries_add_entry(struct bootentries *entries, struct bootentry *entry);
 
-int bootentry_register_provider(int (*fn)(struct bootentries *bootentries, const char *name));
+struct bootentry_provider {
+	int (*generate)(struct bootentries *bootentries, const char *name);
+	/* internal fields */
+	struct list_head list;
+};
+
+int bootentry_register_provider(struct bootentry_provider *provider);
 
 #define bootentries_for_each_entry(bootentries, entry) \
 	list_for_each_entry(entry, &bootentries->entries, list)
-- 
2.39.5