PM / hibernate: convert simple_strtoul to kstrtoul

Fabian Frederick · rafaeljw · commit 317cf7e5e85e · 2014-05-09T23:32:08.000+02:00
Replace obsolete function.

Signed-off-by: Fabian Frederick &lt;fabf@skynet.be&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
@@ -1115,7 +1115,10 @@ static int __init resumewait_setup(char *str)
 
 static int __init resumedelay_setup(char *str)
 {
-	resume_delay = simple_strtoul(str, NULL, 0);
+	int rc = kstrtoul(str, 0, (unsigned long *)&resume_delay);
+
+	if (rc)
+		return rc;
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1115,7 +1115,10 @@ static int __init resumewait_setup(char *str)`
`1115`	`1115`
`1116`	`1116`	`static int __init resumedelay_setup(char *str)`
`1117`	`1117`	`{`
`1118`		`- resume_delay = simple_strtoul(str, NULL, 0);`
	`1118`	`+ int rc = kstrtoul(str, 0, (unsigned long *)&resume_delay);`
	`1119`	`+`
	`1120`	`+ if (rc)`
	`1121`	`+ return rc;`
`1119`	`1122`	`return 1;`
`1120`	`1123`	`}`
`1121`	`1124`