1 files changed, 29 insertions, 7 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4d2c7dfdaabd..b28cc384a5bc 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -230,12 +230,12 @@ our $Inline	= qr{inline|__always_inline|noinline};
 our $Member     = qr{->$Ident|\.$Ident|\[[^]]*\]};
 our $Lval       = qr{$Ident(?:$Member)*};
 
-our $Float_hex  = qr{(?i:0x[0-9a-f]+p-?[0-9]+[fl]?)};
-our $Float_dec  = qr{(?i:((?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?))};
-our $Float_int  = qr{(?i:[0-9]+e-?[0-9]+[fl]?)};
+our $Float_hex  = qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?};
+our $Float_dec  = qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?};
+our $Float_int  = qr{(?i)[0-9]+e-?[0-9]+[fl]?};
 our $Float      = qr{$Float_hex|$Float_dec|$Float_int};
-our $Constant   = qr{(?:$Float|(?i:(?:0x[0-9a-f]+|[0-9]+)[ul]*))};
-our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
+our $Constant   = qr{$Float|(?i)(?:0x[0-9a-f]+|[0-9]+)[ul]*};
+our $Assignment = qr{\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=};
 our $Compare    = qr{<=|>=|==|!=|<|>};
 our $Operators  = qr{
                         <=|>=|==|!=|
@@ -1931,6 +1931,12 @@ sub process {
                               "use the SSYNC() macro in asm/blackfin.h\n" . $herevet);
                 }
 
+# check for old HOTPLUG __dev<foo> section markings
+                if ($line =~ /\b(__dev(init|exit)(data|const|))\b/) {
+                        WARN("HOTPLUG_SECTION",
+                             "Using $1 is unnecessary\n" . $herecurr);
+                }
+
 # Check for potential 'bare' types
                 my ($stat, $cond, $line_nr_next, $remain_next, $off_next,
                     $realline_next);
@@ -2430,6 +2436,15 @@ sub process {
                              "Prefer pr_warn(... to pr_warning(...\n" . $herecurr);
                 }
 
+                if ($line =~ /\bdev_printk\s*\(\s*KERN_([A-Z]+)/) {
+                        my $orig = $1;
+                        my $level = lc($orig);
+                        $level = "warn" if ($level eq "warning");
+                        $level = "dbg" if ($level eq "debug");
+                        WARN("PREFER_DEV_LEVEL",
+                             "Prefer dev_$level(... to dev_printk(KERN_$orig, ...\n" . $herecurr);
+                }
+
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
                 if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
@@ -2915,6 +2930,7 @@ sub process {
                         my $var = $1;
                         if ($var !~ /$Constant/ &&
                             $var =~ /[A-Z]\w*[a-z]|[a-z]\w*[A-Z]/ &&
+                            $var !~ /"^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ &&
                             !defined $camelcase{$var}) {
                                 $camelcase{$var} = 1;
                                 WARN("CAMELCASE",
@@ -3237,9 +3253,9 @@ sub process {
                 }
 
 # prefer usleep_range over udelay
-                if ($line =~ /\budelay\s*\(\s*(\w+)\s*\)/) {
+                if ($line =~ /\budelay\s*\(\s*(\d+)\s*\)/) {
                         # ignore udelay's < 10, however
-                        if (! (($1 =~ /(\d+)/) && ($1 < 10)) ) {
+                        if (! ($1 < 10) ) {
                                 CHK("USLEEP_RANGE",
                                     "usleep_range is preferred over udelay; see Documentation/timers/timers-howto.txt\n" . $line);
                         }
@@ -3460,6 +3476,12 @@ sub process {
                              "unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr);
                 }
 
+# check for alloc argument mismatch
+                if ($line =~ /\b(kcalloc|kmalloc_array)\s*\(\s*sizeof\b/) {
+                        WARN("ALLOC_ARRAY_ARGS",
+                             "$1 uses number as first arg, sizeof is generally wrong\n" . $herecurr);
+                }
+
 # check for multiple semicolons
                 if ($line =~ /;\s*;\s*$/) {
                         WARN("ONE_SEMICOLON",