Commit 8e9ecbc5 authored by Daniel Walter's avatar Daniel Walter Committed by Ralf Baechle

MIPS: Replace calls to obsolete strict_strto call with kstrto* equivalents.

Signed-off-by: default avatarDaniel Walter <dwalter@google.com>
Cc: linux-kernel@vger.kernel.org
Cc: richard@nod.at
Cc: akpm@linux-foundation.org
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 8ca635bf
...@@ -202,17 +202,20 @@ char *tx4927_pcibios_setup(char *str) ...@@ -202,17 +202,20 @@ char *tx4927_pcibios_setup(char *str)
unsigned long val; unsigned long val;
if (!strncmp(str, "trdyto=", 7)) { if (!strncmp(str, "trdyto=", 7)) {
if (strict_strtoul(str + 7, 0, &val) == 0) u8 val = 0;
if (kstrtou8(str + 7, 0, &val) == 0)
tx4927_pci_opts.trdyto = val; tx4927_pci_opts.trdyto = val;
return NULL; return NULL;
} }
if (!strncmp(str, "retryto=", 8)) { if (!strncmp(str, "retryto=", 8)) {
if (strict_strtoul(str + 8, 0, &val) == 0) u8 val = 0;
if (kstrtou8(str + 8, 0, &val) == 0)
tx4927_pci_opts.retryto = val; tx4927_pci_opts.retryto = val;
return NULL; return NULL;
} }
if (!strncmp(str, "gbwc=", 5)) { if (!strncmp(str, "gbwc=", 5)) {
if (strict_strtoul(str + 5, 0, &val) == 0) u16 val;
if (kstrtou16(str + 5, 0, &val) == 0)
tx4927_pci_opts.gbwc = val; tx4927_pci_opts.gbwc = val;
return NULL; return NULL;
} }
......
...@@ -309,8 +309,8 @@ static void __init preprocess_cmdline(void) ...@@ -309,8 +309,8 @@ static void __init preprocess_cmdline(void)
txx9_board_vec = find_board_byname(str + 6); txx9_board_vec = find_board_byname(str + 6);
continue; continue;
} else if (strncmp(str, "masterclk=", 10) == 0) { } else if (strncmp(str, "masterclk=", 10) == 0) {
unsigned long val; unsigned int val;
if (strict_strtoul(str + 10, 10, &val) == 0) if (kstrtouint(str + 10, 10, &val) == 0)
txx9_master_clock = val; txx9_master_clock = val;
continue; continue;
} else if (strcmp(str, "icdisable") == 0) { } else if (strcmp(str, "icdisable") == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment