aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-03-23 18:02:20 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-23 19:58:37 -0400
commit6712d85852b348d07301c7480f7eb3312d329143 (patch)
treedbb4fdfc2dcafb9e22a2a5daed673fb172721605
parent2c92488ab29886d08766c054afc8dd0f19c724f1 (diff)
checkpatch: whitespace - add/remove blank lines
Add blank lines between a few tests, remove an extraneous one. Signed-off-by: Joe Perches <joe@perches.com> Cc: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rwxr-xr-xscripts/checkpatch.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index d1fd466043e..7a2f54a0bd3 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3348,18 +3348,20 @@ sub process {
3348 if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) { 3348 if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) {
3349 WARN("CONSIDER_COMPLETION", 3349 WARN("CONSIDER_COMPLETION",
3350 "consider using a completion\n" . $herecurr); 3350 "consider using a completion\n" . $herecurr);
3351
3352 } 3351 }
3352
3353# recommend kstrto* over simple_strto* and strict_strto* 3353# recommend kstrto* over simple_strto* and strict_strto*
3354 if ($line =~ /\b((simple|strict)_(strto(l|ll|ul|ull)))\s*\(/) { 3354 if ($line =~ /\b((simple|strict)_(strto(l|ll|ul|ull)))\s*\(/) {
3355 WARN("CONSIDER_KSTRTO", 3355 WARN("CONSIDER_KSTRTO",
3356 "$1 is obsolete, use k$3 instead\n" . $herecurr); 3356 "$1 is obsolete, use k$3 instead\n" . $herecurr);
3357 } 3357 }
3358
3358# check for __initcall(), use device_initcall() explicitly please 3359# check for __initcall(), use device_initcall() explicitly please
3359 if ($line =~ /^.\s*__initcall\s*\(/) { 3360 if ($line =~ /^.\s*__initcall\s*\(/) {
3360 WARN("USE_DEVICE_INITCALL", 3361 WARN("USE_DEVICE_INITCALL",
3361 "please use device_initcall() instead of __initcall()\n" . $herecurr); 3362 "please use device_initcall() instead of __initcall()\n" . $herecurr);
3362 } 3363 }
3364
3363# check for various ops structs, ensure they are const. 3365# check for various ops structs, ensure they are const.
3364 my $struct_ops = qr{acpi_dock_ops| 3366 my $struct_ops = qr{acpi_dock_ops|
3365 address_space_operations| 3367 address_space_operations|