Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os 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>

authored by

Daniel Walter and committed by
Ralf Baechle
8e9ecbc5 8ca635bf

+8 -5
+6 -3
arch/mips/pci/ops-tx4927.c
··· 202 202 unsigned long val; 203 203 204 204 if (!strncmp(str, "trdyto=", 7)) { 205 - if (strict_strtoul(str + 7, 0, &val) == 0) 205 + u8 val = 0; 206 + if (kstrtou8(str + 7, 0, &val) == 0) 206 207 tx4927_pci_opts.trdyto = val; 207 208 return NULL; 208 209 } 209 210 if (!strncmp(str, "retryto=", 8)) { 210 - if (strict_strtoul(str + 8, 0, &val) == 0) 211 + u8 val = 0; 212 + if (kstrtou8(str + 8, 0, &val) == 0) 211 213 tx4927_pci_opts.retryto = val; 212 214 return NULL; 213 215 } 214 216 if (!strncmp(str, "gbwc=", 5)) { 215 - if (strict_strtoul(str + 5, 0, &val) == 0) 217 + u16 val; 218 + if (kstrtou16(str + 5, 0, &val) == 0) 216 219 tx4927_pci_opts.gbwc = val; 217 220 return NULL; 218 221 }
+2 -2
arch/mips/txx9/generic/setup.c
··· 309 309 txx9_board_vec = find_board_byname(str + 6); 310 310 continue; 311 311 } else if (strncmp(str, "masterclk=", 10) == 0) { 312 - unsigned long val; 313 - if (strict_strtoul(str + 10, 10, &val) == 0) 312 + unsigned int val; 313 + if (kstrtouint(str + 10, 10, &val) == 0) 314 314 txx9_master_clock = val; 315 315 continue; 316 316 } else if (strcmp(str, "icdisable") == 0) {