diff options
| -rw-r--r-- | arch/mips/pci/ops-tx4927.c | 9 | ||||
| -rw-r--r-- | arch/mips/txx9/generic/setup.c | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c index 3d5df514d024..0e046d82e4e3 100644 --- a/arch/mips/pci/ops-tx4927.c +++ b/arch/mips/pci/ops-tx4927.c | |||
| @@ -202,17 +202,20 @@ char *tx4927_pcibios_setup(char *str) | |||
| 202 | unsigned long val; | 202 | unsigned long val; |
| 203 | 203 | ||
| 204 | if (!strncmp(str, "trdyto=", 7)) { | 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 | tx4927_pci_opts.trdyto = val; | 207 | tx4927_pci_opts.trdyto = val; |
| 207 | return NULL; | 208 | return NULL; |
| 208 | } | 209 | } |
| 209 | if (!strncmp(str, "retryto=", 8)) { | 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 | tx4927_pci_opts.retryto = val; | 213 | tx4927_pci_opts.retryto = val; |
| 212 | return NULL; | 214 | return NULL; |
| 213 | } | 215 | } |
| 214 | if (!strncmp(str, "gbwc=", 5)) { | 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 | tx4927_pci_opts.gbwc = val; | 219 | tx4927_pci_opts.gbwc = val; |
| 217 | return NULL; | 220 | return NULL; |
| 218 | } | 221 | } |
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 2b0b83c171e0..dd2cf25b5ae5 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c | |||
| @@ -309,8 +309,8 @@ static void __init preprocess_cmdline(void) | |||
| 309 | txx9_board_vec = find_board_byname(str + 6); | 309 | txx9_board_vec = find_board_byname(str + 6); |
| 310 | continue; | 310 | continue; |
| 311 | } else if (strncmp(str, "masterclk=", 10) == 0) { | 311 | } else if (strncmp(str, "masterclk=", 10) == 0) { |
| 312 | unsigned long val; | 312 | unsigned int val; |
| 313 | if (strict_strtoul(str + 10, 10, &val) == 0) | 313 | if (kstrtouint(str + 10, 10, &val) == 0) |
| 314 | txx9_master_clock = val; | 314 | txx9_master_clock = val; |
| 315 | continue; | 315 | continue; |
| 316 | } else if (strcmp(str, "icdisable") == 0) { | 316 | } else if (strcmp(str, "icdisable") == 0) { |
