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>

diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 00732474fb55694e3f1e7fac7a7db7b53b86f6ed..112ababa9e5502c6593969d44c976fbd495cf663 100644 (file)
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -228,13 +228,10 @@ early_param("isolnodes", setup_isolnodes);
 #if defined(CONFIG_PCI) && !defined(__tilegx__)
 static int __init setup_pci_reserve(char* str)
 {
-       unsigned long mb;
-
-       if (str == NULL || strict_strtoul(str, 0, &mb) != 0 ||
-           mb > 3 * 1024)
+       if (str == NULL || kstrtouint(str, 0, &pci_reserve_mb) != 0 ||
+           pci_reserve_mb > 3 * 1024)
                return -EINVAL;
 
-       pci_reserve_mb = mb;
        pr_info("Reserving %dMB for PCIE root complex mappings\n",
                pci_reserve_mb);
        return 0;

diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c
index 2d1dbf38a9abe8ff9bfd8fcc18d8e18819889c23..d1d026f0126715d2620c0de1a258f9b806892b4a 100644 (file)
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
@@ -321,14 +321,13 @@ int show_unhandled_signals = 1;
 
 static int __init crashinfo(char *str)
 {
-       unsigned long val;
        const char *word;
 
        if (*str == '\0')
-               val = 2;
-       else if (*str != '=' || strict_strtoul(++str, 0, &val) != 0)
+               show_unhandled_signals = 2;
+       else if (*str != '=' || kstrtoint(++str, 0, &show_unhandled_signals) != 0)
                return 0;
-       show_unhandled_signals = val;
+
        switch (show_unhandled_signals) {
        case 0:
                word = "No";

diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c
index 6b603d556ca6ddc1e431fdbd1b434f28ca4c20b7..f3ceb6308e42f3672183f95df8ad3bdf5f05ef2d 100644 (file)
--- a/arch/tile/kernel/traps.c
+++ b/arch/tile/kernel/traps.c
@@ -42,10 +42,9 @@ static int __init setup_unaligned_fixup(char *str)
         * will still parse the instruction, then fire a SIGBUS with
         * the correct address from inside the single_step code.
         */
-       long val;
-       if (strict_strtol(str, 0, &val) != 0)
+       if (kstrtoint(str, 0, &unaligned_fixup) != 0)
                return 0;
-       unaligned_fixup = val;
+
        pr_info("Fixups for unaligned data accesses are %s\n",
               unaligned_fixup >= 0 ?
               (unaligned_fixup ? "enabled" : "disabled") :

diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c
index 7ba1dc3d41fad14711012fd579889cfd8f854672..bfb3127b4df9e9a53ed250e97d8f60f98eb81607 100644 (file)
--- a/arch/tile/mm/init.c
+++ b/arch/tile/mm/init.c
@@ -912,7 +912,7 @@ static long __write_once initfree = 1;
 static int __init set_initfree(char *str)
 {
        long val;
-       if (strict_strtol(str, 0, &val) == 0) {
+       if (kstrtol(str, 0, &val) == 0) {
                initfree = val;
                pr_info("initfree: %s free init pages\n",
                        initfree ? "will" : "won't");