diff options
| author | John Crispin <john@phrozen.org> | 2016-12-20 19:12:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-18 19:18:37 +0800 |
| commit | e1d9f7592b804195d91ce6eb2bffef30ca7edf77 (patch) | |
| tree | c7dceeff48a06539ee4f54be3f6042355cf61514 /arch | |
| parent | 02b210c18667004c532cfb78efb0bcb0d158e6ff (diff) | |
| download | linux-stable-e1d9f7592b804195d91ce6eb2bffef30ca7edf77.tar.gz linux-stable-e1d9f7592b804195d91ce6eb2bffef30ca7edf77.tar.bz2 linux-stable-e1d9f7592b804195d91ce6eb2bffef30ca7edf77.zip | |
MIPS: ralink: Cosmetic change to prom_init().
commit 9c48568b3692f1a56cbf1935e4eea835e6b185b1 upstream.
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/ralink/prom.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/mips/ralink/prom.c b/arch/mips/ralink/prom.c index 5a73c5e14221..23198c9050e5 100644 --- a/arch/mips/ralink/prom.c +++ b/arch/mips/ralink/prom.c @@ -30,8 +30,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", @@ -60,14 +62,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) |