checkpatch: Fix running out of coreboot's tree

* Fix up tree detection to work in a coreboot tree
* Switch C99_COMMENT from ERR to CHK

Change-Id: Ie8d6d1407853b77a4b3e9763f23481bd9402bc61
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/8418
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Stefan Reinauer 2015-02-11 01:51:32 +01:00
parent 12d45b2f8a
commit 42412b603c
1 changed files with 4 additions and 5 deletions

View File

@ -226,7 +226,7 @@ if ($tree) {
} else { } else {
if (top_of_kernel_tree('.')) { if (top_of_kernel_tree('.')) {
$root = '.'; $root = '.';
} elsif ($0 =~ m@(.*)/scripts/[^/]*$@ && } elsif ($0 =~ m@(.*)/util/lint/[^/]*$@ &&
top_of_kernel_tree($1)) { top_of_kernel_tree($1)) {
$root = $1; $root = $1;
} }
@ -699,9 +699,8 @@ sub top_of_kernel_tree {
my ($root) = @_; my ($root) = @_;
my @tree_check = ( my @tree_check = (
"COPYING", "CREDITS", "Kbuild", "MAINTAINERS", "Makefile", "COPYING", "README", "Makefile", "Makefile.inc",
"README", "Documentation", "arch", "include", "drivers", "src", "documentation", "util", "payloads",
"fs", "init", "ipc", "kernel", "lib", "scripts",
); );
foreach my $check (@tree_check) { foreach my $check (@tree_check) {
@ -2994,7 +2993,7 @@ sub process {
# no C99 // comments # no C99 // comments
if ($line =~ m{//}) { if ($line =~ m{//}) {
if (ERROR("C99_COMMENTS", if (CHK("C99_COMMENTS",
"do not use C99 // comments\n" . $herecurr) && "do not use C99 // comments\n" . $herecurr) &&
$fix) { $fix) {
my $line = $fixed[$fixlinenr]; my $line = $fixed[$fixlinenr];