Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74bc4917 authored by Shuah Khan's avatar Shuah Khan Committed by Ingo Molnar
Browse files

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: default avatarShuah Khan <shuahkhan@gmail.com>
Acked-by: default avatarMuli 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: default avatarIngo Molnar <mingo@kernel.org>
parent ab7b64e9

arch/x86/kernel/pci-calgary_64.c

+5 −3
Original line number Diff line number Diff line
@@ -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);