2012-05-20 23:24:33

by Shuah Khan

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 <[email protected]>
---
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

2012-05-21 06:00:56

by Muli Ben-Yehuda

Subject: Re: [PATCH] x86: kernel/pci-calgary_64.c simple_strtoul cleanup

On Sun, May 20, 2012 at 05:24:28PM -0600, Shuah Khan wrote:
> Change calgary_parse_options() to call kstrtoul() instead of calling
> obsoleted simple_strtoul().
>
> Signed-off-by: Shuah Khan <[email protected]>

Acked-by: Muli Ben-Yehuda <[email protected]>

Cheers,
Muli

2012-05-21 09:47:43

by Shuah Khan

Subject: [tip:x86/cleanups] x86/pci-calgary_64.c: Remove obsoleted simple_strtoul() usage

Commit-ID: 74bc491795420254f8b9c782ec654c9ba005d3ac
Gitweb: http://git.kernel.org/tip/74bc491795420254f8b9c782ec654c9ba005d3ac
Author: Shuah Khan <[email protected]>
AuthorDate: Sun, 20 May 2012 17:24:28 -0600
Committer: Ingo Molnar <[email protected]>
CommitDate: Mon, 21 May 2012 10:29:40 +0200

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 <[email protected]>
Acked-by: Muli Ben-Yehuda <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/1337556268.3126.5.camel@lorien2
Signed-off-by: Ingo Molnar <[email protected]>
---
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 6ac5782..dbbfb26 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);