kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete

JoePerches · torvalds · commit 67d0a0754455 · 2011-10-31T17:30:57.000-07:00
Mark obsolete/deprecated strict_strto&lt;foo&gt; and simple_strto&lt;foo&gt; functions
and macros as obsolete.

Update checkpatch to warn about their use.

Signed-off-by: Joe Perches &lt;joe@perches.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
@@ -287,6 +287,8 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
 	return kstrtoint_from_user(s, count, base, res);
 }
 
+/* Obsolete, do not use.  Use kstrto<foo> instead */
+
 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
 extern long simple_strtol(const char *,char **,unsigned int);
 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
@@ -296,6 +298,8 @@ extern long long simple_strtoll(const char *,char **,unsigned int);
 #define strict_strtoull	kstrtoull
 #define strict_strtoll	kstrtoll
 
+/* lib/printf utilities */
+
 extern __printf(2, 3) int sprintf(char *buf, const char * fmt, ...);
 extern __printf(2, 0) int vsprintf(char *buf, const char *, va_list);
 extern __printf(3, 4)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
@@ -3151,10 +3151,10 @@ sub process {
 			     "consider using a completion\n" . $herecurr);
 
 		}
-# recommend kstrto* over simple_strto*
-		if ($line =~ /\bsimple_(strto.*?)\s*\(/) {
+# recommend kstrto* over simple_strto* and strict_strto*
+		if ($line =~ /\b((simple|strict)_(strto(l|ll|ul|ull)))\s*\(/) {
 			WARN("CONSIDER_KSTRTO",
-			     "consider using kstrto* in preference to simple_$1\n" . $herecurr);
+			     "$1 is obsolete, use k$3 instead\n" . $herecurr);
 		}
 # check for __initcall(), use device_initcall() explicitly please
 		if ($line =~ /^.\s*__initcall\s*\(/) {

Original file line number	Diff line number	Diff line change
`@@ -3151,10 +3151,10 @@ sub process {`
`3151`	`3151`	`"consider using a completion\n" . $herecurr);`
`3152`	`3152`
`3153`	`3153`	`}`
`3154`		`-# recommend kstrto* over simple_strto*`
`3155`		`- if ($line =~ /\bsimple_(strto.?)\s\(/) {`
	`3154`	`+# recommend kstrto* over simple_strto* and strict_strto*`
	`3155`	`+ if ($line =~ /\b((simple\|strict)_(strto(l\|ll\|ul\|ull)))\s*\(/) {`
`3156`	`3156`	`WARN("CONSIDER_KSTRTO",`
`3157`		`- "consider using kstrto* in preference to simple_$1\n" . $herecurr);`
	`3157`	`+ "$1 is obsolete, use k$3 instead\n" . $herecurr);`
`3158`	`3158`	`}`
`3159`	`3159`	`# check for __initcall(), use device_initcall() explicitly please`
`3160`	`3160`	`if ($line =~ /^.\s__initcall\s\(/) {`