Skip to contentSkip to conversation

checkpatch: debugfs_remove() can take NULL

PATCH Superseded Constantine Shulyupin 2 participants 2 messages Nov 17, 2012 Checkpatch

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 checkpatch: debugfs_remove() can take NULL

From: Constantine Shulyupin <[email protected]>

debugfs_remove() and debugfs_remove_recursive() can take a NULL, so let's check and warn about that.

Changes since v2, as Joe Perches suggested:
- match whitespace around argument

Changes since v1, as Joe Perches suggested:
- added debugfs_remove_recursive
- all tests for patterns are "if (a) xxx(a)" are consolidates

---
 scripts/checkpatch.pl |   23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)
scripts/checkpatch.pl +16 -7
index f18750e..c041e97 100755
@@ -3213,21 +3213,30 @@ sub process {
 				$herecurr);
 		}
 
+# check for needless "if (<foo>) fn(<foo>)" uses
+		if ($prevline =~ /\bif\s*\(\s*($Lval)\s*\)/) {
+			my $expr = '\s*\(\s*' . quotemeta($1) . '\s*\)\s*;';
+
 # check for needless kfree() checks
-		if ($prevline =~ /\bif\s*\(([^\)]*)\)/) {
-			my $expr = $1;
-			if ($line =~ /\bkfree\(\Q$expr\E\);/) {
+			if ($line =~ /\bkfree$expr/) {
 				WARN("NEEDLESS_KFREE",
 				     "kfree(NULL) is safe this check is probably not required\n" . $hereprev);
 			}
-		}
 # check for needless usb_free_urb() checks
-		if ($prevline =~ /\bif\s*\(([^\)]*)\)/) {
-			my $expr = $1;
-			if ($line =~ /\busb_free_urb\(\Q$expr\E\);/) {
+			if ($line =~ /\busb_free_urb$expr/) {
 				WARN("NEEDLESS_USB_FREE_URB",
 				     "usb_free_urb(NULL) is safe this check is probably not required\n" . $hereprev);
 			}
+# check for needless debugfs_remove() and debugfs_remove_recursive*() checks
+			if ($line =~ /\b(debugfs_remove(?:_recursive)?)$expr/) {
+				WARN("NEEDLESS_DEBUGFS_REMOVE",
+				     "$1(NULL) is safe this check is probably not required\n" . $hereprev);
+			}
+# check for needless debugfs_remove_recursive() and debugfs_remove_recursive*() checks
+			if ($line =~ /\b(debugfs_remove_recursive(?:_recursive)?)$expr/) {
+				WARN("NEEDLESS_DEBUGFS_REMOVE_RECURSIVE",
+				     "$1(NULL) is safe this check is probably not required\n" . $hereprev);
+			}
 		}
 
 # prefer usleep_range over udelay
Signature · 1 line
1.7.9.5
maintainer
#1 lore raw
Quoted 1 line · Constantine Shulyupin

From: Constantine Shulyupin <[email protected]>

Hi Constantine.

scripts/checkpatch.pl

Quoted 1 line
scripts/checkpatch.pl +0 -0

[]

scripts/checkpatch.pl sub process { · line 3234

Quoted 5 lines
scripts/checkpatch.pl +5 -0
+# check for needless debugfs_remove() and debugfs_remove_recursive*() checks
+			if ($line =~ /\b(debugfs_remove(?:_recursive)?)$expr/) {
+				WARN("NEEDLESS_DEBUGFS_REMOVE",
+				     "$1(NULL) is safe this check is probably not required\n" . $hereprev);
+			}

OK,

scripts/checkpatch.pl sub process { · line 3239

Quoted 5 lines
scripts/checkpatch.pl +5 -0
+# check for needless debugfs_remove_recursive() and debugfs_remove_recursive*() checks
+			if ($line =~ /\b(debugfs_remove_recursive(?:_recursive)?)$expr/) {
+				WARN("NEEDLESS_DEBUGFS_REMOVE_RECURSIVE",
+				     "$1(NULL) is safe this check is probably not required\n" . $hereprev);
+			}

You don't need thus second block.
The first check finds both
debugfs_remove(foo)
and
debugfs_remove_recursive(bar)

The second one is redundant