checkpatch: update suggested printk conversions

Direct conversion of printk(KERN_<LEVEL>...  to pr_<level> isn't the
preferred conversion when a struct net_device or struct device is
available.

Hint that using netdev_<level> or dev_<level> is preferred to using
pr_<level>.  Add netdev_dbg and dev_dbg variants too.

Miscellaneous whitespace neatening of a misplaced close brace.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5ae91889bc6b..844af8b4c078 100755
--- a/scripts/checkpatch.pl
+++ b/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*\(/) {