2 files changed, 77 insertions, 19 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index bd88f11b0953..2039acdf5122 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -195,7 +195,7 @@ our $typeTypedefs = qr{(?x:
 our $logFunctions = qr{(?x:
         printk|
         pr_(debug|dbg|vdbg|devel|info|warning|err|notice|alert|crit|emerg|cont)|
-        dev_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)|
+        (dev|netdev|netif)_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)|
         WARN|
         panic
 )};
@@ -224,6 +224,12 @@ our @modifierList = (
         qr{fastcall},
 );
 
+our $allowed_asm_includes = qr{(?x:
+        irq|
+        memory
+)};
+# memory.h: ARM has a custom one
+
 sub build_types {
         my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";
         my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
@@ -552,6 +558,9 @@ sub ctx_statement_block {
                         $type = ($level != 0)? '{' : '';
 
                         if ($level == 0) {
+                                if (substr($blk, $off + 1, 1) eq ';') {
+                                        $off++;
+                                }
                                 last;
                         }
                 }
@@ -1403,7 +1412,8 @@ sub process {
 #80 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*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ ||
+                    $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
                     $length > 80)
                 {
                         WARN("line over 80 characters\n" . $herecurr);
@@ -1448,6 +1458,13 @@ sub process {
                         WARN("please, no space before tabs\n" . $herevet);
                 }
 
+# check for spaces at the beginning of a line.
+                if ($rawline =~ /^\+ / && $rawline !~ /\+ +\*/)  {
+                        my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+                        WARN("please, no space for starting a line, \
+                                excluding comments\n" . $herevet);
+                }
+
 # check we are in a valid C source file if not then ignore this hunk
                 next if ($realfile !~ /\.(h|c)$/);
 
@@ -1778,9 +1795,9 @@ sub process {
                         WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr);
                 }
 
-# check for external initialisers.
+# check for global initialisers.
                 if ($line =~ /^.$Type\s*$Ident\s*(?:\s+$Modifier)*\s*=\s*(0|NULL|false)\s*;/) {
-                        ERROR("do not initialise externals to 0 or NULL\n" .
+                        ERROR("do not initialise globals to 0 or NULL\n" .
                                 $herecurr);
                 }
 # check for static initialisers.
@@ -2308,7 +2325,7 @@ sub process {
                         my $checkfile = "include/linux/$file";
                         if (-f "$root/$checkfile" &&
                             $realfile ne $checkfile &&
-                            $1 ne 'irq')
+                            $1 !~ /$allowed_asm_includes/)
                         {
                                 if ($realfile =~ m{^arch/}) {
                                         CHK("Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
@@ -2570,6 +2587,21 @@ sub process {
                         }
                 }
 
+# prefer usleep_range over udelay
+                if ($line =~ /\budelay\s*\(\s*(\w+)\s*\)/) {
+                        # ignore udelay's < 10, however
+                        if (! (($1 =~ /(\d+)/) && ($1 < 10)) ) {
+                                CHK("usleep_range is preferred over udelay; see Documentation/timers/timers-howto.txt\n" . $line);
+                        }
+                }
+
+# warn about unexpectedly long msleep's
+                if ($line =~ /\bmsleep\s*\((\d+)\);/) {
+                        if ($1 < 20) {
+                                WARN("msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt\n" . $line);
+                        }
+                }
+
 # warn about #ifdefs in C files
 #               if ($line =~ /^.\s*\#\s*if(|n)def/ && ($realfile =~ /\.c$/)) {
 #                       print "#ifdef in C files should be avoided\n";
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index c827309c29cf..1ce655dde99e 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1245,6 +1245,8 @@ static void report_sec_mismatch(const char *modname,
 {
         const char *from, *from_p;
         const char *to, *to_p;
+        char *prl_from;
+        char *prl_to;
 
         switch (from_is_func) {
         case 0: from = "variable"; from_p = "";   break;
@@ -1268,16 +1270,21 @@ static void report_sec_mismatch(const char *modname,
 
         switch (mismatch->mismatch) {
         case TEXT_TO_ANY_INIT:
+                prl_from = sec2annotation(fromsec);
+                prl_to = sec2annotation(tosec);
                 fprintf(stderr,
                 "The function %s%s() references\n"
                 "the %s %s%s%s.\n"
                 "This is often because %s lacks a %s\n"
                 "annotation or the annotation of %s is wrong.\n",
-                sec2annotation(fromsec), fromsym,
-                to, sec2annotation(tosec), tosym, to_p,
-                fromsym, sec2annotation(tosec), tosym);
+                prl_from, fromsym,
+                to, prl_to, tosym, to_p,
+                fromsym, prl_to, tosym);
+                free(prl_from);
+                free(prl_to);
                 break;
         case DATA_TO_ANY_INIT: {
+                prl_to = sec2annotation(tosec);
                 const char *const *s = mismatch->symbol_white_list;
                 fprintf(stderr,
                 "The variable %s references\n"
@@ -1285,20 +1292,24 @@ static void report_sec_mismatch(const char *modname,
                 "If the reference is valid then annotate the\n"
                 "variable with __init* or __refdata (see linux/init.h) "
                 "or name the variable:\n",
-                fromsym, to, sec2annotation(tosec), tosym, to_p);
+                fromsym, to, prl_to, tosym, to_p);
                 while (*s)
                         fprintf(stderr, "%s, ", *s++);
                 fprintf(stderr, "\n");
+                free(prl_to);
                 break;
         }
         case TEXT_TO_ANY_EXIT:
+                prl_to = sec2annotation(tosec);
                 fprintf(stderr,
                 "The function %s() references a %s in an exit section.\n"
                 "Often the %s %s%s has valid usage outside the exit section\n"
                 "and the fix is to remove the %sannotation of %s.\n",
-                fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym);
+                fromsym, to, to, tosym, to_p, prl_to, tosym);
+                free(prl_to);
                 break;
         case DATA_TO_ANY_EXIT: {
+                prl_to = sec2annotation(tosec);
                 const char *const *s = mismatch->symbol_white_list;
                 fprintf(stderr,
                 "The variable %s references\n"
@@ -1306,24 +1317,31 @@ static void report_sec_mismatch(const char *modname,
                 "If the reference is valid then annotate the\n"
                 "variable with __exit* (see linux/init.h) or "
                 "name the variable:\n",
-                fromsym, to, sec2annotation(tosec), tosym, to_p);
+                fromsym, to, prl_to, tosym, to_p);
                 while (*s)
                         fprintf(stderr, "%s, ", *s++);
                 fprintf(stderr, "\n");
+                free(prl_to);
                 break;
         }
         case XXXINIT_TO_SOME_INIT:
         case XXXEXIT_TO_SOME_EXIT:
+                prl_from = sec2annotation(fromsec);
+                prl_to = sec2annotation(tosec);
                 fprintf(stderr,
                 "The %s %s%s%s references\n"
                 "a %s %s%s%s.\n"
                 "If %s is only used by %s then\n"
                 "annotate %s with a matching annotation.\n",
-                from, sec2annotation(fromsec), fromsym, from_p,
-                to, sec2annotation(tosec), tosym, to_p,
+                from, prl_from, fromsym, from_p,
+                to, prl_to, tosym, to_p,
                 tosym, fromsym, tosym);
+                free(prl_from);
+                free(prl_to);
                 break;
         case ANY_INIT_TO_ANY_EXIT:
+                prl_from = sec2annotation(fromsec);
+                prl_to = sec2annotation(tosec);
                 fprintf(stderr,
                 "The %s %s%s%s references\n"
                 "a %s %s%s%s.\n"
@@ -1332,11 +1350,15 @@ static void report_sec_mismatch(const char *modname,
                 "uses functionality in the exit path.\n"
                 "The fix is often to remove the %sannotation of\n"
                 "%s%s so it may be used outside an exit section.\n",
-                from, sec2annotation(fromsec), fromsym, from_p,
-                to, sec2annotation(tosec), tosym, to_p,
+                from, prl_from, fromsym, from_p,
+                to, prl_to, tosym, to_p,
                 sec2annotation(tosec), tosym, to_p);
+                free(prl_from);
+                free(prl_to);
                 break;
         case ANY_EXIT_TO_ANY_INIT:
+                prl_from = sec2annotation(fromsec);
+                prl_to = sec2annotation(tosec);
                 fprintf(stderr,
                 "The %s %s%s%s references\n"
                 "a %s %s%s%s.\n"
@@ -1345,16 +1367,20 @@ static void report_sec_mismatch(const char *modname,
                 "uses functionality in the init path.\n"
                 "The fix is often to remove the %sannotation of\n"
                 "%s%s so it may be used outside an init section.\n",
-                from, sec2annotation(fromsec), fromsym, from_p,
-                to, sec2annotation(tosec), tosym, to_p,
-                sec2annotation(tosec), tosym, to_p);
+                from, prl_from, fromsym, from_p,
+                to, prl_to, tosym, to_p,
+                prl_to, tosym, to_p);
+                free(prl_from);
+                free(prl_to);
                 break;
         case EXPORT_TO_INIT_EXIT:
+                prl_to = sec2annotation(tosec);
                 fprintf(stderr,
                 "The symbol %s is exported and annotated %s\n"
                 "Fix this by removing the %sannotation of %s "
                 "or drop the export.\n",
-                tosym, sec2annotation(tosec), sec2annotation(tosec), tosym);
+                tosym, prl_to, prl_to, tosym);
+                free(prl_to);
                 break;
         }
         fprintf(stderr, "\n");