diff options
| author | Shuah Khan <shuahkhan@gmail.com> | 2012-05-20 17:24:28 -0600 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-21 10:29:40 +0200 |
| commit | 74bc491795420254f8b9c782ec654c9ba005d3ac (patch) | |
| tree | 29afbf76e36314f076ac960fb74904cf4490fb8b | |
| parent | ab7b64e9ee1e930ffe9d7f5b5eebe618a3b3a03b (diff) | |
| download | linux-stable-74bc491795420254f8b9c782ec654c9ba005d3ac.tar.gz linux-stable-74bc491795420254f8b9c782ec654c9ba005d3ac.tar.bz2 linux-stable-74bc491795420254f8b9c782ec654c9ba005d3ac.zip | |
x86/pci-calgary_64.c: Remove obsoleted simple_strtoul() usage
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>
| -rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 6ac5782f4d6b..dbbfb261e62c 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -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); |