diff --git a/[refs] b/[refs] index 8d4eaa6ad4c9..40c62427fda4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa64205df9dfd7b7662cc64a7e82115c00e428e5 +refs/heads/master: 8f26b8376faad26372a579606ecbd77b20e99dd8 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 5ae91889bc6b..844af8b4c078 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -421,7 +421,7 @@ sub top_of_kernel_tree { } } return 1; - } +} sub parse_email { my ($formatted_email) = @_; @@ -2399,8 +2399,10 @@ sub process { my $orig = $1; my $level = lc($orig); $level = "warn" if ($level eq "warning"); + my $level2 = $level; + $level2 = "dbg" if ($level eq "debug"); WARN("PREFER_PR_LEVEL", - "Prefer pr_$level(... to printk(KERN_$1, ...\n" . $herecurr); + "Prefer netdev_$level2(netdev, ... then dev_$level2(dev, ... then pr_$level(... to printk(KERN_$orig ...\n" . $herecurr); } if ($line =~ /\bpr_warning\s*\(/) {