forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
ab7b64e9ee
commit
74bc491795
|
@ -1479,8 +1479,9 @@ int __init detect_calgary(void)
|
|||
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);
|
||||
|
|
Loading…
Reference in New Issue
Block a user