1 files changed, 272 insertions, 64 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4d08b398411f..f0bb6d60c07b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -7,9 +7,11 @@
 
 use strict;
 use POSIX;
+use File::Basename;
+use Cwd 'abs_path';
 
 my $P = $0;
-$P =~ s@.*/@@g;
+my $D = dirname(abs_path($P));
 
 my $V = '0.32';
 
@@ -43,6 +45,8 @@ my $configuration_file = ".checkpatch.conf";
 my $max_line_length = 80;
 my $ignore_perl_version = 0;
 my $minimum_perl_version = 5.10.0;
+my $min_conf_desc_length = 4;
+my $spelling_file = "$D/spelling.txt";
 
 sub help {
         my ($exitcode) = @_;
@@ -63,6 +67,7 @@ Options:
   --types TYPE(,TYPE2...)    show only these comma separated message types
   --ignore TYPE(,TYPE2...)   ignore various comma separated message types
   --max-line-length=n        set the maximum line length, if exceeded, warn
+  --min-conf-desc-length=n   set the min description length, if shorter, warn
   --show-types               show the message "types" in the output
   --root=PATH                PATH to the kernel tree root
   --no-summary               suppress the per-file summary
@@ -131,6 +136,7 @@ GetOptions(
         'types=s'       => \@use,
         'show-types!'   => \$show_types,
         'max-line-length=i' => \$max_line_length,
+        'min-conf-desc-length=i' => \$min_conf_desc_length,
         'root=s'        => \$root,
         'summary!'      => \$summary,
         'mailback!'     => \$mailback,
@@ -425,10 +431,38 @@ foreach my $entry (@mode_permission_funcs) {
 
 our $allowed_asm_includes = qr{(?x:
         irq|
-        memory
+        memory|
+        time|
+        reboot
 )};
 # memory.h: ARM has a custom one
 
+# Load common spelling mistakes and build regular expression list.
+my $misspellings;
+my %spelling_fix;
+
+if (open(my $spelling, '<', $spelling_file)) {
+        my @spelling_list;
+        while (<$spelling>) {
+                my $line = $_;
+
+                $line =~ s/\s*\n?$//g;
+                $line =~ s/^\s*//g;
+
+                next if ($line =~ m/^\s*#/);
+                next if ($line =~ m/^\s*$/);
+
+                my ($suspect, $fix) = split(/\|\|/, $line);
+
+                push(@spelling_list, $suspect);
+                $spelling_fix{$suspect} = $fix;
+        }
+        close($spelling);
+        $misspellings = join("|", @spelling_list);
+} else {
+        warn "No typos will be found - file '$spelling_file': $!\n";
+}
+
 sub build_types {
         my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";
         my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
@@ -912,7 +946,7 @@ sub sanitise_line {
 sub get_quoted_string {
         my ($line, $rawline) = @_;
 
-        return "" if ($line !~ m/(\"[X]+\")/g);
+        return "" if ($line !~ m/(\"[X\t]+\")/g);
         return substr($rawline, $-[0], $+[0] - $-[0]);
 }
 
@@ -1813,6 +1847,7 @@ sub process {
         my $non_utf8_charset = 0;
 
         my $last_blank_line = 0;
+        my $last_coalesced_string_linenr = -1;
 
         our @report = ();
         our $cnt_lines = 0;
@@ -2048,6 +2083,12 @@ sub process {
                         $in_commit_log = 0;
                 }
 
+# Check if MAINTAINERS is being updated.  If so, there's probably no need to
+# emit the "does MAINTAINERS need updating?" message on file add/move/delete
+                if ($line =~ /^\s*MAINTAINERS\s*\|/) {
+                        $reported_maintainer_file = 1;
+                }
+
 # Check signature styles
                 if (!$in_header_lines &&
                     $line =~ /^(\s*)([a-z0-9_-]+by:|$signature_tags)(\s*)(.*)/i) {
@@ -2215,6 +2256,23 @@ sub process {
                             "8-bit UTF-8 used in possible commit log\n" . $herecurr);
                 }
 
+# Check for various typo / spelling mistakes
+                if (defined($misspellings) && ($in_commit_log || $line =~ /^\+/)) {
+                        while ($rawline =~ /(?:^|[^a-z@])($misspellings)(?:$|[^a-z@])/gi) {
+                                my $typo = $1;
+                                my $typo_fix = $spelling_fix{lc($typo)};
+                                $typo_fix = ucfirst($typo_fix) if ($typo =~ /^[A-Z]/);
+                                $typo_fix = uc($typo_fix) if ($typo =~ /^[A-Z]+$/);
+                                my $msg_type = \&WARN;
+                                $msg_type = \&CHK if ($file);
+                                if (&{$msg_type}("TYPO_SPELLING",
+                                                 "'$typo' may be misspelled - perhaps '$typo_fix'?\n" . $herecurr) &&
+                                    $fix) {
+                                        $fixed[$fixlinenr] =~ s/(^|[^A-Za-z@])($typo)($|[^A-Za-z@])/$1$typo_fix$3/;
+                                }
+                        }
+                }
+
 # ignore non-hunk lines and lines being removed
                 next if (!$hunk_line || $line =~ /^-/);
 
@@ -2283,8 +2341,10 @@ sub process {
                                 }
                                 $length++;
                         }
-                        WARN("CONFIG_DESCRIPTION",
-                             "please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($is_start && $is_end && $length < 4);
+                        if ($is_start && $is_end && $length < $min_conf_desc_length) {
+                                WARN("CONFIG_DESCRIPTION",
+                                     "please write a paragraph that describes the config symbol fully\n" . $herecurr);
+                        }
                         #print "is_start<$is_start> is_end<$is_end> length<$length>\n";
                 }
 
@@ -2341,7 +2401,7 @@ sub process {
                 }
 
 # check we are in a valid source file if not then ignore this hunk
-                next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
+                next if ($realfile !~ /\.(h|c|s|S|pl|sh|dtsi|dts)$/);
 
 #line length limit
                 if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
@@ -2354,33 +2414,6 @@ sub process {
                              "line over $max_line_length characters\n" . $herecurr);
                 }
 
-# Check for user-visible strings broken across lines, which breaks the ability
-# to grep for the string.  Make exceptions when the previous string ends in a
-# newline (multiple lines in one string constant) or '\t', '\r', ';', or '{'
-# (common in inline assembly) or is a octal \123 or hexadecimal \xaf value
-                if ($line =~ /^\+\s*"/ &&
-                    $prevline =~ /"\s*$/ &&
-                    $prevrawline !~ /(?:\\(?:[ntr]|[0-7]{1,3}|x[0-9a-fA-F]{1,2})|;\s*|\{\s*)"\s*$/) {
-                        WARN("SPLIT_STRING",
-                             "quoted string split across lines\n" . $hereprev);
-                }
-
-# check for missing a space in a string concatination
-                if ($prevrawline =~ /[^\\]\w"$/ && $rawline =~ /^\+[\t ]+"\w/) {
-                        WARN('MISSING_SPACE',
-                             "break quoted strings at a space character\n" . $hereprev);
-                }
-
-# check for spaces before a quoted newline
-                if ($rawline =~ /^.*\".*\s\\n/) {
-                        if (WARN("QUOTED_WHITESPACE_BEFORE_NEWLINE",
-                                 "unnecessary whitespace before a quoted newline\n" . $herecurr) &&
-                            $fix) {
-                                $fixed[$fixlinenr] =~ s/^(\+.*\".*)\s+\\n/$1\\n/;
-                        }
-
-                }
-
 # check for adding lines without a newline.
                 if ($line =~ /^\+/ && defined $lines[$linenr] && $lines[$linenr] =~ /^\\ No newline at end of file/) {
                         WARN("MISSING_EOF_NEWLINE",
@@ -2402,7 +2435,7 @@ sub process {
                 }
 
 # check we are in a valid source file C or perl if not then ignore this hunk
-                next if ($realfile !~ /\.(h|c|pl)$/);
+                next if ($realfile !~ /\.(h|c|pl|dtsi|dts)$/);
 
 # at the beginning of a line any tabs must come first and anything
 # more than 8 must use tabs.
@@ -2424,7 +2457,7 @@ sub process {
                                 "please, no space before tabs\n" . $herevet) &&
                             $fix) {
                                 while ($fixed[$fixlinenr] =~
-                                           s/(^\+.*) {8,8}+\t/$1\t\t/) {}
+                                           s/(^\+.*) {8,8}\t/$1\t\t/) {}
                                 while ($fixed[$fixlinenr] =~
                                            s/(^\+.*) +\t/$1\t/) {}
                         }
@@ -2466,7 +2499,8 @@ sub process {
                         }
                 }
 
-                if ($line =~ /^\+.*\(\s*$Type\s*\)[ \t]+(?!$Assignment|$Arithmetic|{)/) {
+                if ($line =~ /^\+.*(\w+\s*)?\(\s*$Type\s*\)[ \t]+(?!$Assignment|$Arithmetic|[,;\({\[\<\>])/ &&
+                    (!defined($1) || $1 !~ /sizeof\s*/)) {
                         if (CHK("SPACING",
                                 "No space is necessary after a cast\n" . $herecurr) &&
                             $fix) {
@@ -2592,10 +2626,14 @@ sub process {
                 next if ($realfile !~ /\.(h|c)$/);
 
 # check indentation of any line with a bare else
+# (but not if it is a multiple line "if (foo) return bar; else return baz;")
 # if the previous line is a break or return and is indented 1 tab more...
                 if ($sline =~ /^\+([\t]+)(?:}[ \t]*)?else(?:[ \t]*{)?\s*$/) {
                         my $tabs = length($1) + 1;
-                        if ($prevline =~ /^\+\t{$tabs,$tabs}(?:break|return)\b/) {
+                        if ($prevline =~ /^\+\t{$tabs,$tabs}break\b/ ||
+                            ($prevline =~ /^\+\t{$tabs,$tabs}return\b/ &&
+                             defined $lines[$linenr] &&
+                             $lines[$linenr] !~ /^[ \+]\t{$tabs,$tabs}return/)) {
                                 WARN("UNNECESSARY_ELSE",
                                      "else is not generally useful after a break or return\n" . $hereprev);
                         }
@@ -3510,14 +3548,33 @@ sub process {
                                                 }
                                         }
 
-                                # , must have a space on the right.
+                                # , must not have a space before and must have a space on the right.
                                 } elsif ($op eq ',') {
+                                        my $rtrim_before = 0;
+                                        my $space_after = 0;
+                                        if ($ctx =~ /Wx./) {
+                                                if (ERROR("SPACING",
+                                                          "space prohibited before that '$op' $at\n" . $hereptr)) {
+                                                        $line_fixed = 1;
+                                                        $rtrim_before = 1;
+                                                }
+                                        }
                                         if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/) {
                                                 if (ERROR("SPACING",
                                                           "space required after that '$op' $at\n" . $hereptr)) {
-                                                        $good = $fix_elements[$n] . trim($fix_elements[$n + 1]) . " ";
                                                         $line_fixed = 1;
                                                         $last_after = $n;
+                                                        $space_after = 1;
+                                                }
+                                        }
+                                        if ($rtrim_before || $space_after) {
+                                                if ($rtrim_before) {
+                                                        $good = rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+                                                } else {
+                                                        $good = $fix_elements[$n] . trim($fix_elements[$n + 1]);
+                                                }
+                                                if ($space_after) {
+                                                        $good .= " ";
                                                 }
                                         }
 
@@ -3752,7 +3809,6 @@ sub process {
                         if (ERROR("SPACING",
                                   "space prohibited before that close parenthesis ')'\n" . $herecurr) &&
                             $fix) {
-                                print("fixlinenr: <$fixlinenr> fixed[fixlinenr]: <$fixed[$fixlinenr]>\n");
                                 $fixed[$fixlinenr] =~
                                     s/\s+\)/\)/;
                         }
@@ -3762,9 +3818,27 @@ sub process {
 # ie: &(foo->bar) should be &foo->bar and *(foo->bar) should be *foo->bar
 
                 while ($line =~ /(?:[^&]&\s*|\*)\(\s*($Ident\s*(?:$Member\s*)+)\s*\)/g) {
-                        CHK("UNNECESSARY_PARENTHESES",
-                            "Unnecessary parentheses around $1\n" . $herecurr);
-                    }
+                        my $var = $1;
+                        if (CHK("UNNECESSARY_PARENTHESES",
+                                "Unnecessary parentheses around $var\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$fixlinenr] =~ s/\(\s*\Q$var\E\s*\)/$var/;
+                        }
+                }
+
+# check for unnecessary parentheses around function pointer uses
+# ie: (foo->bar)(); should be foo->bar();
+# but not "if (foo->bar) (" to avoid some false positives
+                if ($line =~ /(\bif\s*|)(\(\s*$Ident\s*(?:$Member\s*)+\))[ \t]*\(/ && $1 !~ /^if/) {
+                        my $var = $2;
+                        if (CHK("UNNECESSARY_PARENTHESES",
+                                "Unnecessary parentheses around function pointer $var\n" . $herecurr) &&
+                            $fix) {
+                                my $var2 = deparenthesize($var);
+                                $var2 =~ s/\s//g;
+                                $fixed[$fixlinenr] =~ s/\Q$var\E/$var2/;
+                        }
+                }
 
 #goto labels aren't indented, allow a single space however
                 if ($line=~/^.\s+[A-Za-z\d_]+:(?![0-9]+)/ and
@@ -4004,7 +4078,9 @@ sub process {
 #Ignore Page<foo> variants
                             $var !~ /^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ &&
 #Ignore SI style variants like nS, mV and dB (ie: max_uV, regulator_min_uA_show)
-                            $var !~ /^(?:[a-z_]*?)_?[a-z][A-Z](?:_[a-z_]+)?$/) {
+                            $var !~ /^(?:[a-z_]*?)_?[a-z][A-Z](?:_[a-z_]+)?$/ &&
+#Ignore some three character SI units explicitly, like MiB and KHz
+                            $var !~ /^(?:[a-z_]*?)_?(?:[KMGT]iB|[KMGT]?Hz)(?:_[a-z_]+)?$/) {
                                 while ($var =~ m{($Ident)}g) {
                                         my $word = $1;
                                         next if ($word !~ /[A-Z][a-z]|[a-z][A-Z]/);
@@ -4060,12 +4136,17 @@ sub process {
                         my $cnt = $realcnt;
                         my ($off, $dstat, $dcond, $rest);
                         my $ctx = '';
+                        my $has_flow_statement = 0;
+                        my $has_arg_concat = 0;
                         ($dstat, $dcond, $ln, $cnt, $off) =
                                 ctx_statement_block($linenr, $realcnt, 0);
                         $ctx = $dstat;
                         #print "dstat<$dstat> dcond<$dcond> cnt<$cnt> off<$off>\n";
                         #print "LINE<$lines[$ln-1]> len<" . length($lines[$ln-1]) . "\n";
 
+                        $has_flow_statement = 1 if ($ctx =~ /\b(goto|return)\b/);
+                        $has_arg_concat = 1 if ($ctx =~ /\#\#/);
+
                         $dstat =~ s/^.\s*\#\s*define\s+$Ident(?:\([^\)]*\))?\s*//;
                         $dstat =~ s/$;//g;
                         $dstat =~ s/\\\n.//g;
@@ -4126,8 +4207,21 @@ sub process {
                                               "Macros with multiple statements should be enclosed in a do - while loop\n" . "$herectx");
                                 } else {
                                         ERROR("COMPLEX_MACRO",
-                                              "Macros with complex values should be enclosed in parenthesis\n" . "$herectx");
+                                              "Macros with complex values should be enclosed in parentheses\n" . "$herectx");
+                                }
+                        }
+
+# check for macros with flow control, but without ## concatenation
+# ## concatenation is commonly a macro that defines a function so ignore those
+                        if ($has_flow_statement && !$has_arg_concat) {
+                                my $herectx = $here . "\n";
+                                my $cnt = statement_rawlines($ctx);
+
+                                for (my $n = 0; $n < $cnt; $n++) {
+                                        $herectx .= raw_line($linenr, $n) . "\n";
                                 }
+                                WARN("MACRO_WITH_FLOW_CONTROL",
+                                     "Macros with flow control statements should be avoided\n" . "$herectx");
                         }
 
 # check for line continuations outside of #defines, preprocessor #, and asm
@@ -4338,6 +4432,85 @@ sub process {
                              "Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
                 }
 
+# Check for user-visible strings broken across lines, which breaks the ability
+# to grep for the string.  Make exceptions when the previous string ends in a
+# newline (multiple lines in one string constant) or '\t', '\r', ';', or '{'
+# (common in inline assembly) or is a octal \123 or hexadecimal \xaf value
+                if ($line =~ /^\+\s*"[X\t]*"/ &&
+                    $prevline =~ /"\s*$/ &&
+                    $prevrawline !~ /(?:\\(?:[ntr]|[0-7]{1,3}|x[0-9a-fA-F]{1,2})|;\s*|\{\s*)"\s*$/) {
+                        if (WARN("SPLIT_STRING",
+                                 "quoted string split across lines\n" . $hereprev) &&
+                                     $fix &&
+                                     $prevrawline =~ /^\+.*"\s*$/ &&
+                                     $last_coalesced_string_linenr != $linenr - 1) {
+                                my $extracted_string = get_quoted_string($line, $rawline);
+                                my $comma_close = "";
+                                if ($rawline =~ /\Q$extracted_string\E(\s*\)\s*;\s*$|\s*,\s*)/) {
+                                        $comma_close = $1;
+                                }
+
+                                fix_delete_line($fixlinenr - 1, $prevrawline);
+                                fix_delete_line($fixlinenr, $rawline);
+                                my $fixedline = $prevrawline;
+                                $fixedline =~ s/"\s*$//;
+                                $fixedline .= substr($extracted_string, 1) . trim($comma_close);
+                                fix_insert_line($fixlinenr - 1, $fixedline);
+                                $fixedline = $rawline;
+                                $fixedline =~ s/\Q$extracted_string\E\Q$comma_close\E//;
+                                if ($fixedline !~ /\+\s*$/) {
+                                        fix_insert_line($fixlinenr, $fixedline);
+                                }
+                                $last_coalesced_string_linenr = $linenr;
+                        }
+                }
+
+# check for missing a space in a string concatenation
+                if ($prevrawline =~ /[^\\]\w"$/ && $rawline =~ /^\+[\t ]+"\w/) {
+                        WARN('MISSING_SPACE',
+                             "break quoted strings at a space character\n" . $hereprev);
+                }
+
+# check for spaces before a quoted newline
+                if ($rawline =~ /^.*\".*\s\\n/) {
+                        if (WARN("QUOTED_WHITESPACE_BEFORE_NEWLINE",
+                                 "unnecessary whitespace before a quoted newline\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$fixlinenr] =~ s/^(\+.*\".*)\s+\\n/$1\\n/;
+                        }
+
+                }
+
+# concatenated string without spaces between elements
+                if ($line =~ /"X+"[A-Z_]+/ || $line =~ /[A-Z_]+"X+"/) {
+                        CHK("CONCATENATED_STRING",
+                            "Concatenated strings should use spaces between elements\n" . $herecurr);
+                }
+
+# uncoalesced string fragments
+                if ($line =~ /"X*"\s*"/) {
+                        WARN("STRING_FRAGMENTS",
+                             "Consecutive strings are generally better as a single string\n" . $herecurr);
+                }
+
+# check for %L{u,d,i} in strings
+                my $string;
+                while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
+                        $string = substr($rawline, $-[1], $+[1] - $-[1]);
+                        $string =~ s/%%/__/g;
+                        if ($string =~ /(?<!%)%L[udi]/) {
+                                WARN("PRINTF_L",
+                                     "\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
+                                last;
+                        }
+                }
+
+# check for line continuations in quoted strings with odd counts of "
+                if ($rawline =~ /\\$/ && $rawline =~ tr/"/"/ % 2) {
+                        WARN("LINE_CONTINUATIONS",
+                             "Avoid line continuations in quoted strings\n" . $herecurr);
+                }
+
 # warn about #if 0
                 if ($line =~ /^.\s*\#\s*if\s+0\b/) {
                         CHK("REDUNDANT_CODE",
@@ -4350,7 +4523,7 @@ sub process {
                         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);
+                                     "$1(NULL) is safe and this check is probably not required\n" . $hereprev);
                         }
                 }
 
@@ -4371,6 +4544,39 @@ sub process {
                         }
                 }
 
+# check for logging functions with KERN_<LEVEL>
+                if ($line !~ /printk\s*\(/ &&
+                    $line =~ /\b$logFunctions\s*\(.*\b(KERN_[A-Z]+)\b/) {
+                        my $level = $1;
+                        if (WARN("UNNECESSARY_KERN_LEVEL",
+                                 "Possible unnecessary $level\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$fixlinenr] =~ s/\s*$level\s*//;
+                        }
+                }
+
+# check for mask then right shift without a parentheses
+                if ($^V && $^V ge 5.10.0 &&
+                    $line =~ /$LvalOrFunc\s*\&\s*($LvalOrFunc)\s*>>/ &&
+                    $4 !~ /^\&/) { # $LvalOrFunc may be &foo, ignore if so
+                        WARN("MASK_THEN_SHIFT",
+                             "Possible precedence defect with mask then right shift - may need parentheses\n" . $herecurr);
+                }
+
+# check for pointer comparisons to NULL
+                if ($^V && $^V ge 5.10.0) {
+                        while ($line =~ /\b$LvalOrFunc\s*(==|\!=)\s*NULL\b/g) {
+                                my $val = $1;
+                                my $equal = "!";
+                                $equal = "" if ($4 eq "!=");
+                                if (CHK("COMPARISON_TO_NULL",
+                                        "Comparison to NULL could be written \"${equal}${val}\"\n" . $herecurr) &&
+                                            $fix) {
+                                        $fixed[$fixlinenr] =~ s/\b\Q$val\E\s*(?:==|\!=)\s*NULL\b/$equal$val/;
+                                }
+                        }
+                }
+
 # check for bad placement of section $InitAttribute (e.g.: __initdata)
                 if ($line =~ /(\b$InitAttribute\b)/) {
                         my $attr = $1;
@@ -4565,6 +4771,15 @@ sub process {
                         }
                 }
 
+# Check for __attribute__ weak, or __weak declarations (may have link issues)
+                if ($^V && $^V ge 5.10.0 &&
+                    $line =~ /(?:$Declare|$DeclareMisordered)\s*$Ident\s*$balanced_parens\s*(?:$Attribute)?\s*;/ &&
+                    ($line =~ /\b__attribute__\s*\(\s*\(.*\bweak\b/ ||
+                     $line =~ /\b__weak\b/)) {
+                        ERROR("WEAK_DECLARATION",
+                              "Using weak declarations can have unintended link defects\n" . $herecurr);
+                }
+
 # check for sizeof(&)
                 if ($line =~ /\bsizeof\s*\(\s*\&/) {
                         WARN("SIZEOF_ADDRESS",
@@ -4580,12 +4795,6 @@ sub process {
                         }
                 }
 
-# check for line continuations in quoted strings with odd counts of "
-                if ($rawline =~ /\\$/ && $rawline =~ tr/"/"/ % 2) {
-                        WARN("LINE_CONTINUATIONS",
-                             "Avoid line continuations in quoted strings\n" . $herecurr);
-                }
-
 # check for struct spinlock declarations
                 if ($line =~ /^.\s*\bstruct\s+spinlock\s+\w+\s*;/) {
                         WARN("USE_SPINLOCK_T",
@@ -4821,6 +5030,17 @@ sub process {
                         }
                 }
 
+# check for #defines like: 1 << <digit> that could be BIT(digit)
+                if ($line =~ /#\s*define\s+\w+\s+\(?\s*1\s*([ulUL]*)\s*\<\<\s*(?:\d+|$Ident)\s*\)?/) {
+                        my $ull = "";
+                        $ull = "_ULL" if (defined($1) && $1 =~ /ll/i);
+                        if (CHK("BIT_MACRO",
+                                "Prefer using the BIT$ull macro\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$fixlinenr] =~ s/\(?\s*1\s*[ulUL]*\s*<<\s*(\d+|$Ident)\s*\)?/BIT${ull}($1)/;
+                        }
+                }
+
 # check for case / default statements not preceded by break/fallthrough/switch
                 if ($line =~ /^.\s*(?:case\s+(?:$Ident|$Constant)\s*|default):/) {
                         my $has_break = 0;
@@ -4984,18 +5204,6 @@ sub process {
                               "#define of '$1' is wrong - use Kconfig variables or standard guards instead\n" . $herecurr);
                 }
 
-# check for %L{u,d,i} in strings
-                my $string;
-                while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
-                        $string = substr($rawline, $-[1], $+[1] - $-[1]);
-                        $string =~ s/%%/__/g;
-                        if ($string =~ /(?<!%)%L[udi]/) {
-                                WARN("PRINTF_L",
-                                     "\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
-                                last;
-                        }
-                }
-
 # whine mightly about in_atomic
                 if ($line =~ /\bin_atomic\s*\(/) {
                         if ($realfile =~ m@^drivers/@) {