forked from Minki/linux
MIPS: Replace calls to obsolete strict_strto call with kstrto* equivalents.
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>
This commit is contained in:
parent
8ca635bfc0
commit
8e9ecbc5e2
@ -202,17 +202,20 @@ char *tx4927_pcibios_setup(char *str)
|
||||
unsigned long val;
|
||||
|
||||
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;
|
||||
return NULL;
|
||||
}
|
||||
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;
|
||||
return NULL;
|
||||
}
|
||||
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;
|
||||
return NULL;
|
||||
}
|
||||
|
@ -309,8 +309,8 @@ static void __init preprocess_cmdline(void)
|
||||
txx9_board_vec = find_board_byname(str + 6);
|
||||
continue;
|
||||
} else if (strncmp(str, "masterclk=", 10) == 0) {
|
||||
unsigned long val;
|
||||
if (strict_strtoul(str + 10, 10, &val) == 0)
|
||||
unsigned int val;
|
||||
if (kstrtouint(str + 10, 10, &val) == 0)
|
||||
txx9_master_clock = val;
|
||||
continue;
|
||||
} else if (strcmp(str, "icdisable") == 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user