diff options
author | Daniel Walter <dwalter@google.com> | 2014-06-03 11:21:05 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 16:50:40 -0400 |
commit | 8ca635bfc0e4488d167cea322c7e098689f37080 (patch) | |
tree | 046f386a892f0bff2b87cde39aa987780408e099 | |
parent | b4f16c938eed87aac733972e735c5bea700948aa (diff) |
MIPS: Replace obsolete strict_strto call with kstrto
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>
-rw-r--r-- | arch/mips/alchemy/board-xxs1500.c | 2 | ||||
-rw-r--r-- | arch/mips/alchemy/devboards/pm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/alchemy/board-xxs1500.c b/arch/mips/alchemy/board-xxs1500.c index bd5513650293..3fb814be0e91 100644 --- a/arch/mips/alchemy/board-xxs1500.c +++ b/arch/mips/alchemy/board-xxs1500.c | |||
@@ -49,7 +49,7 @@ void __init prom_init(void) | |||
49 | prom_init_cmdline(); | 49 | prom_init_cmdline(); |
50 | 50 | ||
51 | memsize_str = prom_getenv("memsize"); | 51 | memsize_str = prom_getenv("memsize"); |
52 | if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize)) | 52 | if (!memsize_str || kstrtoul(memsize_str, 0, &memsize)) |
53 | memsize = 0x04000000; | 53 | memsize = 0x04000000; |
54 | 54 | ||
55 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 55 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
diff --git a/arch/mips/alchemy/devboards/pm.c b/arch/mips/alchemy/devboards/pm.c index b86bff31d1d3..61e90fe9eab1 100644 --- a/arch/mips/alchemy/devboards/pm.c +++ b/arch/mips/alchemy/devboards/pm.c | |||
@@ -158,7 +158,7 @@ static ssize_t db1x_pmattr_store(struct kobject *kobj, | |||
158 | int tmp; | 158 | int tmp; |
159 | 159 | ||
160 | if (ATTRCMP(timer_timeout)) { | 160 | if (ATTRCMP(timer_timeout)) { |
161 | tmp = strict_strtoul(instr, 0, &l); | 161 | tmp = kstrtoul(instr, 0, &l); |
162 | if (tmp) | 162 | if (tmp) |
163 | return tmp; | 163 | return tmp; |
164 | 164 | ||
@@ -181,7 +181,7 @@ static ssize_t db1x_pmattr_store(struct kobject *kobj, | |||
181 | } | 181 | } |
182 | 182 | ||
183 | } else if (ATTRCMP(wakemsk)) { | 183 | } else if (ATTRCMP(wakemsk)) { |
184 | tmp = strict_strtoul(instr, 0, &l); | 184 | tmp = kstrtoul(instr, 0, &l); |
185 | if (tmp) | 185 | if (tmp) |
186 | return tmp; | 186 | return tmp; |
187 | 187 | ||