[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1337556268.3126.5.camel@lorien2>
Date: Sun, 20 May 2012 17:24:28 -0600
From: Shuah Khan <shuahkhan@...il.com>
To: muli@...ibm.com, jdmason@...zu.us, tglx@...utronix.de,
mingo@...hat.com, hpa@...or.com
Cc: shuahkhan@...il.com, x86@...nel.org, discuss@...-64.org,
LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] x86: kernel/pci-calgary_64.c simple_strtoul cleanup
Change calgary_parse_options() to call kstrtoul() instead of calling
obsoleted simple_strtoul().
Signed-off-by: Shuah Khan <shuahkhan@...il.com>
---
arch/x86/kernel/pci-calgary_64.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index d0b2fb9..b72838b 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -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);
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists