lkml.org 
[lkml]   [2017]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 011/142] MIPS: ralink: Cosmetic change to prom_init().
    Date
    From: John Crispin <john@phrozen.org>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    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 9c64f029d047..87312dfcee38 100644
    --- a/arch/mips/ralink/prom.c
    +++ b/arch/mips/ralink/prom.c
    @@ -24,8 +24,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",
    @@ -54,14 +56,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)
    --
    2.12.2
    \
     
     \ /
      Last update: 2017-04-10 18:16    [W:2.537 / U:1.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site