Merge branches 'x86-asm-for-linus', 'x86-cleanups-for-linus', 'x86-cpu-for-linus...
[linux-3.10.git] / arch / x86 / kernel / pci-calgary_64.c
index d0b2fb9..b72838b 100644 (file)
@@ -1480,8 +1480,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))
@@ -1512,10 +1513,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);