Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeef5733 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

checkpatch: printks always need a KERN_<LEVEL> 

There was code in checkpatch that allowed continuation printks to be
used without KERN_CONT.  Remove the continuation check and always
require a KERN_<LEVEL>.

Link: http://lkml.kernel.org/r/61980ef41d5b9b6543da1c49055042e0ab74d308.1507047008.git.joe@perches.com


Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 258f79d5

scripts/checkpatch.pl

+4 −22
Original line number Diff line number Diff line
@@ -3829,28 +3829,10 @@ sub process { 
			     "Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit\n" . $herecurr);

		}



# printk should use KERN_* levels.  Note that follow on printk's on the

# same line do not need a level, so we use the current block context

# to try and find and validate the current printk.  In summary the current

# printk includes all preceding printk's which have no newline on the end.

# we assume the first bad printk is the one to report.

		if ($line =~ /\bprintk\((?!KERN_)\s*"/) {

			my $ok = 0;

			for (my $ln = $linenr - 1; $ln >= $first_line; $ln--) {

				#print "CHECK<$lines[$ln - 1]\n";

				# we have a preceding printk if it ends

				# with "\n" ignore it, else it is to blame

				if ($lines[$ln - 1] =~ m{\bprintk\(}) {

					if ($rawlines[$ln - 1] !~ m{\\n"}) {

						$ok = 1;

					}

					last;

				}

			}

			if ($ok == 0) {

# printk should use KERN_* levels

		if ($line =~ /\bprintk\s*\(\s*(?!KERN_[A-Z]+\b)/) {

			WARN("PRINTK_WITHOUT_KERN_LEVEL",

				     "printk() should include KERN_ facility level\n" . $herecurr);

			}

			     "printk() should include KERN_<LEVEL> facility level\n" . $herecurr);

		}



		if ($line =~ /\bprintk\s*\(\s*KERN_([A-Z]+)/) {