From: John Crispin john@phrozen.org
This patch has been added to the stable tree. If you have any objections, please let us know.
===============
[ Upstream commit 9c48568b3692f1a56cbf1935e4eea835e6b185b1 ]
Over the years the code has been changed various times leading to argc/argv being defined in a different function to where we actually use the variables. Clean this up by moving them to prom_init_cmdline().
Signed-off-by: John Crispin john@phrozen.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14902/ Signed-off-by: Ralf Baechle ralf@linux-mips.org Signed-off-by: Sasha Levin alexander.levin@microsoft.com --- arch/mips/ralink/prom.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/mips/ralink/prom.c b/arch/mips/ralink/prom.c index 09419f67da39..bdfc253958f4 100644 --- a/arch/mips/ralink/prom.c +++ b/arch/mips/ralink/prom.c @@ -25,8 +25,10 @@ const char *get_system_type(void) return soc_info.sys_type; }
-static __init void prom_init_cmdline(int argc, char **argv) +static __init void prom_init_cmdline(void) { + int argc; + char **argv; int i;
pr_debug("prom: fw_arg0=%08x fw_arg1=%08x fw_arg2=%08x fw_arg3=%08x\n", @@ -55,14 +57,11 @@ static __init void prom_init_cmdline(int argc, char **argv)
void __init prom_init(void) { - int argc; - char **argv; - prom_soc_init(&soc_info);
pr_info("SoC Type: %s\n", get_system_type());
- prom_init_cmdline(argc, argv); + prom_init_cmdline(); }
void __init prom_free_prom_memory(void)