checkpatch: increase line length to 120

[fw/openocd] / tools / scripts / checkpatch.pl

diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl
index 703fa06c6ecf1f6cf4dc96f307d6654fc9e0118d..7c67cd0699a75e24dc8c0f3606652ea65ac8fe82 100755 (executable)
--- a/tools/scripts/checkpatch.pl
+++ b/tools/scripts/checkpatch.pl
@@ -1664,15 +1664,15 @@ 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)$/);
 
-#100 column limit
+#120 column limit
                if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
                    $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
                    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:|,|\)\s*;)\s*$/ ||
                    $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
-                   $length > 100)
+                   $length > 120)
                {
                        WARN("LONG_LINE",
-                            "line over 100 characters\n" . $herecurr);
+                            "line over 120 characters\n" . $herecurr);
                }
 
 # check for spaces before a quoted newline
@@ -1965,7 +1965,7 @@ sub process {
 
                        #print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> stat_real<$stat_real> stat<$stat>\n";
 
-                       if ($check && (($sindent % 8) != 0 ||
+                       if ($check && (($sindent % 4) != 0 ||
                            ($sindent <= $indent && $s ne ''))) {
                                WARN("SUSPECT_CODE_INDENT",
                                     "suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");
@@ -2121,14 +2121,14 @@ sub process {
 
 # check for new typedefs, only function parameters and sparse annotations
 # make sense.
-               if ($line =~ /\btypedef\s/ &&
-                   $line !~ /\btypedef\s+$Type\s*\(\s*\*?$Ident\s*\)\s*\(/ &&
-                   $line !~ /\btypedef\s+$Type\s+$Ident\s*\(/ &&
-                   $line !~ /\b$typeTypedefs\b/ &&
-                   $line !~ /\b__bitwise(?:__|)\b/) {
-                       WARN("NEW_TYPEDEFS",
-                            "do not add new typedefs\n" . $herecurr);
-               }
+#              if ($line =~ /\btypedef\s/ &&
+#                  $line !~ /\btypedef\s+$Type\s*\(\s*\*?$Ident\s*\)\s*\(/ &&
+#                  $line !~ /\btypedef\s+$Type\s+$Ident\s*\(/ &&
+#                  $line !~ /\b$typeTypedefs\b/ &&
+#                  $line !~ /\b__bitwise(?:__|)\b/) {
+#                      WARN("NEW_TYPEDEFS",
+#                           "do not add new typedefs\n" . $herecurr);
+#              }
 
 # * goes on variable not on type
                # (char*[ const])
@@ -2961,11 +2961,11 @@ sub process {
                }
 
 # no volatiles please
-               my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
-               if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
-                       WARN("VOLATILE",
-                            "Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
-               }
+#              my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
+#              if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
+#                      WARN("VOLATILE",
+#                           "Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
+#              }
 
 # warn about #if 0
                if ($line =~ /^.\s*\#\s*if\s+0\b/) {