The patch titled Subject: checkpatch: consolidate if (foo) bar(foo) checks and add debugfs_remove has been removed from the -mm tree. Its filename was checkpatch-consolidate-if-foo-barfoo-checks-and-add-debugfs_remove.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Andy Whitcroft <apw@xxxxxxxxxxxxx> Subject: checkpatch: consolidate if (foo) bar(foo) checks and add debugfs_remove Consolidate the if (foo) bar(foo) detectors into a single check. Add debugfs_remove and family. Based on a patch by Constantine Shulyupin. Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxxx> Cc: Constantine Shulyupin <const@xxxxxxxxxxxxx>. Cc: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff -puN scripts/checkpatch.pl~checkpatch-consolidate-if-foo-barfoo-checks-and-add-debugfs_remove scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-consolidate-if-foo-barfoo-checks-and-add-debugfs_remove +++ a/scripts/checkpatch.pl @@ -3198,20 +3198,12 @@ sub process { $herecurr); } -# check for needless kfree() checks - if ($prevline =~ /\bif\s*\(([^\)]*)\)/) { - my $expr = $1; - if ($line =~ /\bkfree\(\Q$expr\E\);/) { - 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\);/) { - WARN("NEEDLESS_USB_FREE_URB", - "usb_free_urb(NULL) is safe this check is probably not required\n" . $hereprev); +# check for needless "if (<foo>) fn(<foo>)" uses + if ($prevline =~ /\bif\s*\(\s*($Lval)\s*\)/) { + my $expr = '\s*\(\s*' . quotemeta($1) . '\s*\)\s*;'; + if ($line =~ /\b(kfree|usb_free_urb|debugfs_remove(?:_recursive)?)$expr/) { + WARN('NEEDLESS_IF', + "$1(NULL) is safe this check is probably not required\n" . $hereprev); } } _ Patches currently in -mm which might be from apw@xxxxxxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html