diff mbox series

[v2,22/30] discover/powerpc: Add param_name arg

Message ID 048ee2258797a9d9c102814f06f368ab7bbca4d2.1533230644.git.geoff@infradead.org
State Accepted
Headers show
Series [v2,01/30] docker: Add libfdt-dev | expand

Commit Message

Geoff Levand Aug. 2, 2018, 5:29 p.m. UTC 
Update update_network_config and update_bootdev_config to
operate on a generic parameter name passed as an argument.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 discover/platform-powerpc.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index c7432fb..87ff72e 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -609,7 +609,7 @@  static void update_string_config(struct platform_powerpc *platform,
 }
 
 static void update_network_config(struct platform_powerpc *platform,
-	struct config *config)
+	const char *param_name, const struct config *config)
 {
 	unsigned int i;
 	char *val;
@@ -642,13 +642,13 @@  static void update_network_config(struct platform_powerpc *platform,
 		talloc_free(dns_str);
 	}
 
-	update_string_config(platform, "petitboot,network", val);
+	update_string_config(platform, param_name, val);
 
 	talloc_free(val);
 }
 
 static void update_bootdev_config(struct platform_powerpc *platform,
-		struct config *config)
+		const char *param_name, const struct config *config)
 {
 	char *val = NULL, *boot_str = NULL, *tmp = NULL;
 	struct autoboot_option *opt;
@@ -674,7 +674,7 @@  static void update_bootdev_config(struct platform_powerpc *platform,
 			tmp = val = talloc_asprintf_append(val, "%s", boot_str);
 	}
 
-	update_string_config(platform, "petitboot,bootdevs", val);
+	update_string_config(platform, param_name, val);
 	talloc_free(tmp);
 	if (boot_str)
 		talloc_free(boot_str);
@@ -721,9 +721,9 @@  static void update_config(struct platform_powerpc *platform,
 	val = config->https_proxy ?: "";
 	update_string_config(platform, "petitboot,https_proxy", val);
 
-	update_network_config(platform, config);
+	update_network_config(platform, "petitboot,network", config);
 
-	update_bootdev_config(platform, config);
+	update_bootdev_config(platform, "petitboot,bootdevs", config);
 }
 
 static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev,
@@ -1071,7 +1071,7 @@  static void get_ipmi_network_override(struct platform_powerpc *platform,
 
 	if (!rc && persistent) {
 		/* Write this new config to NVRAM */
-		update_network_config(platform, config);
+		update_network_config(platform, "petitboot,network", config);
 		rc = write_nvram(platform);
 		if (rc)
 			pb_log("platform: Failed to save persistent interface override\n");