MIPS: Replace obsolete strict_strto call with kstrto
authorDaniel Walter <dwalter@google.com>
Tue, 3 Jun 2014 15:21:05 +0000 (16:21 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 4 Jun 2014 20:50:40 +0000 (22:50 +0200)
Signed-off-by: Daniel Walter <dwalter@google.com>
Cc: linux-kernel@vger.kernel.org
Cc: richard@nod.at
Cc: akpm@linux-foundation.org
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/alchemy/board-xxs1500.c
arch/mips/alchemy/devboards/pm.c

index bd55136..3fb814b 100644 (file)
@@ -49,7 +49,7 @@ void __init prom_init(void)
        prom_init_cmdline();
 
        memsize_str = prom_getenv("memsize");
-       if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize))
+       if (!memsize_str || kstrtoul(memsize_str, 0, &memsize))
                memsize = 0x04000000;
 
        add_memory_region(0, memsize, BOOT_MEM_RAM);
index b86bff3..61e90fe 100644 (file)
@@ -158,7 +158,7 @@ static ssize_t db1x_pmattr_store(struct kobject *kobj,
        int tmp;
 
        if (ATTRCMP(timer_timeout)) {
-               tmp = strict_strtoul(instr, 0, &l);
+               tmp = kstrtoul(instr, 0, &l);
                if (tmp)
                        return tmp;
 
@@ -181,7 +181,7 @@ static ssize_t db1x_pmattr_store(struct kobject *kobj,
                }
 
        } else if (ATTRCMP(wakemsk)) {
-               tmp = strict_strtoul(instr, 0, &l);
+               tmp = kstrtoul(instr, 0, &l);
                if (tmp)
                        return tmp;