x86/pci-calgary_64.c: Remove obsoleted simple_strtoul() usage
authorShuah Khan <shuahkhan@gmail.com>
Sun, 20 May 2012 23:24:28 +0000 (17:24 -0600)
committerIngo Molnar <mingo@kernel.org>
Mon, 21 May 2012 08:29:40 +0000 (10:29 +0200)
Change calgary_parse_options() to call kstrtoul() instead of
calling obsoleted simple_strtoul().

Signed-off-by: Shuah Khan <shuahkhan@gmail.com>
Acked-by: Muli Ben-Yehuda <muli@cs.technion.ac.il>
Cc: jdmason@kudzu.us
Link: http://lkml.kernel.org/r/1337556268.3126.5.camel@lorien2
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/pci-calgary_64.c

index 6ac5782f4d6bf6cfb90666bc5288aad548d0c04f..dbbfb261e62c6aaa77b8a7fbc45643b4db2c7e27 100644 (file)
@@ -1479,8 +1479,9 @@ cleanup:
 static int __init calgary_parse_options(char *p)
 {
        unsigned int bridge;
+       unsigned long val;
        size_t len;
-       char* endp;
+       ssize_t ret;
 
        while (*p) {
                if (!strncmp(p, "64k", 3))
@@ -1511,10 +1512,11 @@ static int __init calgary_parse_options(char *p)
                                ++p;
                        if (*p == '\0')
                                break;
-                       bridge = simple_strtoul(p, &endp, 0);
-                       if (p == endp)
+                       ret = kstrtoul(p, 0, &val);
+                       if (ret)
                                break;
 
+                       bridge = val;
                        if (bridge < MAX_PHB_BUS_NUM) {
                                printk(KERN_INFO "Calgary: disabling "
                                       "translation for PHB %#x\n", bridge);