checkpatch.pl: be silent when -q and --ignore is given

dedekind · torvalds · commit 11232688ec41 · 2012-03-23T16:58:36.000-07:00
Fix checkpatch.pl when both -q and --ignore are given and prevents it from
printing a

NOTE: Ignored message types: blah

messages.

E.g., if I use -q --ignore PREFER_PACKED,PREFER_ALIGNED, i see:

NOTE: Ignored message types: PREFER_ALIGNED PREFER_PACKED

It makes no sense to print this when -q is given.

Signed-off-by: Artem Bityutskiy &lt;artem.bityutskiy@linux.intel.com&gt;
Cc: Andy Whitcroft &lt;apw@canonical.com&gt;
Cc: 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/scripts/checkpatch.pl b/scripts/checkpatch.pl
@@ -3474,13 +3474,12 @@ sub process {
 		}
 	}
 
-	if (keys %ignore_type) {
+	if ($quiet == 0 && keys %ignore_type) {
 	    print "NOTE: Ignored message types:";
 	    foreach my $ignore (sort keys %ignore_type) {
 		print " $ignore";
 	    }
-	    print "\n";
-	    print "\n" if ($quiet == 0);
+	    print "\n\n";
 	}
 
 	if ($clean == 1 && $quiet == 0) {

Original file line number	Diff line number	Diff line change
`@@ -3474,13 +3474,12 @@ sub process {`
`3474`	`3474`	`}`
`3475`	`3475`	`}`
`3476`	`3476`
`3477`		`- if (keys %ignore_type) {`
	`3477`	`+ if ($quiet == 0 && keys %ignore_type) {`
`3478`	`3478`	`print "NOTE: Ignored message types:";`
`3479`	`3479`	`foreach my $ignore (sort keys %ignore_type) {`
`3480`	`3480`	`print " $ignore";`
`3481`	`3481`	`}`
`3482`		`- print "\n";`
`3483`		`- print "\n" if ($quiet == 0);`
	`3482`	`+ print "\n\n";`
`3484`	`3483`	`}`
`3485`	`3484`
`3486`	`3485`	`if ($clean == 1 && $quiet == 0) {`