aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDaniel Walter <dwalter@google.com>2014-05-26 17:59:32 -0400
committerChris Metcalf <cmetcalf@tilera.com>2014-05-28 15:47:16 -0400
commitb2dfa048bae3b4afe1944237c1ee9525df00bb6f (patch)
treeda24a40aece892980fad9aa2d4aec3aff9e61377 /arch
parentba159fd387a4d47bb41ddc3b06bfc28f33e8d936 (diff)
replace strict_strto* call with kstrto*
remove obsolete calls to strict_strto* and replace them with kstrto* calls accordingly. Signed-off-by: Daniel Walter <dwalter@google.com> Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/tile/kernel/setup.c7
-rw-r--r--arch/tile/kernel/signal.c7
-rw-r--r--arch/tile/kernel/traps.c5
-rw-r--r--arch/tile/mm/init.c2
4 files changed, 8 insertions, 13 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 00732474fb55..112ababa9e55 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -228,13 +228,10 @@ early_param("isolnodes", setup_isolnodes);
228#if defined(CONFIG_PCI) && !defined(__tilegx__) 228#if defined(CONFIG_PCI) && !defined(__tilegx__)
229static int __init setup_pci_reserve(char* str) 229static int __init setup_pci_reserve(char* str)
230{ 230{
231 unsigned long mb; 231 if (str == NULL || kstrtouint(str, 0, &pci_reserve_mb) != 0 ||
232 232 pci_reserve_mb > 3 * 1024)
233 if (str == NULL || strict_strtoul(str, 0, &mb) != 0 ||
234 mb > 3 * 1024)
235 return -EINVAL; 233 return -EINVAL;
236 234
237 pci_reserve_mb = mb;
238 pr_info("Reserving %dMB for PCIE root complex mappings\n", 235 pr_info("Reserving %dMB for PCIE root complex mappings\n",
239 pci_reserve_mb); 236 pci_reserve_mb);
240 return 0; 237 return 0;
diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c
index 2d1dbf38a9ab..d1d026f01267 100644
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
@@ -321,14 +321,13 @@ int show_unhandled_signals = 1;
321 321
322static int __init crashinfo(char *str) 322static int __init crashinfo(char *str)
323{ 323{
324 unsigned long val;
325 const char *word; 324 const char *word;
326 325
327 if (*str == '\0') 326 if (*str == '\0')
328 val = 2; 327 show_unhandled_signals = 2;
329 else if (*str != '=' || strict_strtoul(++str, 0, &val) != 0) 328 else if (*str != '=' || kstrtoint(++str, 0, &show_unhandled_signals) != 0)
330 return 0; 329 return 0;
331 show_unhandled_signals = val; 330
332 switch (show_unhandled_signals) { 331 switch (show_unhandled_signals) {
333 case 0: 332 case 0:
334 word = "No"; 333 word = "No";
diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c
index 6b603d556ca6..f3ceb6308e42 100644
--- a/arch/tile/kernel/traps.c
+++ b/arch/tile/kernel/traps.c
@@ -42,10 +42,9 @@ static int __init setup_unaligned_fixup(char *str)
42 * will still parse the instruction, then fire a SIGBUS with 42 * will still parse the instruction, then fire a SIGBUS with
43 * the correct address from inside the single_step code. 43 * the correct address from inside the single_step code.
44 */ 44 */
45 long val; 45 if (kstrtoint(str, 0, &unaligned_fixup) != 0)
46 if (strict_strtol(str, 0, &val) != 0)
47 return 0; 46 return 0;
48 unaligned_fixup = val; 47
49 pr_info("Fixups for unaligned data accesses are %s\n", 48 pr_info("Fixups for unaligned data accesses are %s\n",
50 unaligned_fixup >= 0 ? 49 unaligned_fixup >= 0 ?
51 (unaligned_fixup ? "enabled" : "disabled") : 50 (unaligned_fixup ? "enabled" : "disabled") :
diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c
index 7ba1dc3d41fa..bfb3127b4df9 100644
--- a/arch/tile/mm/init.c
+++ b/arch/tile/mm/init.c
@@ -912,7 +912,7 @@ static long __write_once initfree = 1;
912static int __init set_initfree(char *str) 912static int __init set_initfree(char *str)
913{ 913{
914 long val; 914 long val;
915 if (strict_strtol(str, 0, &val) == 0) { 915 if (kstrtol(str, 0, &val) == 0) {
916 initfree = val; 916 initfree = val;
917 pr_info("initfree: %s free init pages\n", 917 pr_info("initfree: %s free init pages\n",
918 initfree ? "will" : "won't"); 918 initfree ? "will" : "won't");