From: Florian Vaussard <florian.vaussard@epfl.ch>
To: Andy Whitcroft <apw@canonical.com>, Joe Perches <joe@perches.com>
Cc: Rob Herring <robh@kernel.org>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 4/4] checkpatch: improve the compatible vendor match
Date: Fri, 7 Mar 2014 14:38:03 +0100 [thread overview]
Message-ID: <1394199483-26147-1-git-send-email-florian.vaussard@epfl.ch> (raw)
In-Reply-To: <1394198771-25913-5-git-send-email-florian.vaussard@epfl.ch>
From: Joe Perches <joe@perches.com>
Improve the vendor name match in vendor-prefix.txt
by only matching the exact vendor name at the beginning of lines.
Signed-off-by: Joe Perches <joe@perches.com>
[florian.vaussard@epfl.ch: split patch, commit log]
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
---
scripts/checkpatch.pl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 9205153..5bda9f7 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2047,9 +2047,11 @@ sub process {
my @compats = $rawline =~ /\"([a-zA-Z0-9\-\,\.\+_]+)\"/g;
+ my $dt_path = $root . "/Documentation/devicetree/bindings/";
+ my $vp_file = $dt_path . "vendor-prefixes.txt";
+
foreach my $compat (@compats) {
my $compat2 = $compat;
- my $dt_path = $root . "/Documentation/devicetree/bindings/";
$compat2 =~ s/\,[a-z]*\-/\,<\.\*>\-/;
`grep -Erq "$compat|$compat2" $dt_path`;
if ( $? >> 8 ) {
@@ -2057,14 +2059,12 @@ sub process {
"DT compatible string \"$compat\" appears un-documented -- check $dt_path\n" . $herecurr);
}
- my $vendor_path = $dt_path . "vendor-prefixes.txt";
- next if (! -f $vendor_path);
next if $compat !~ /^([a-zA-Z0-9\-]+)\,/;
my $vendor = $1;
- `grep -Eq "$vendor" $vendor_path`;
+ `grep -Eq "^$vendor\\b" $vp_file`;
if ( $? >> 8 ) {
WARN("UNDOCUMENTED_DT_STRING",
- "DT compatible string vendor \"$vendor\" appears un-documented -- check $vendor_path\n" . $herecurr);
+ "DT compatible string vendor \"$vendor\" appears un-documented -- check $vp_file\n" . $herecurr);
}
}
}
--
1.8.5.3
next prev parent reply other threads:[~2014-03-07 13:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-07 13:26 [PATCH v3 0/4] checkpatch: enhance compatible string checking Florian Vaussard
2014-03-07 13:26 ` [PATCH v3 1/4] checkpatch: check vendor compatible with dashes Florian Vaussard
2014-03-07 13:26 ` [PATCH v3 3/4] checkpatch: check compatible strings in .c and .h too Florian Vaussard
[not found] ` <1394198771-25913-4-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2014-03-07 13:29 ` Florian Vaussard
2014-03-07 13:34 ` Florian Vaussard
[not found] ` <1394198771-25913-1-git-send-email-florian.vaussard-p8DiymsW2f8@public.gmane.org>
2014-03-07 13:26 ` [PATCH v3 2/4] checkpatch: fix spurious vendor compatible warnings Florian Vaussard
2014-03-07 13:26 ` [PATCH v3 4/4] checkpatch: improve the compatible vendor match Florian Vaussard
2014-03-07 13:38 ` Florian Vaussard [this message]
2014-03-07 16:08 ` [PATCH v3 0/4] checkpatch: enhance compatible string checking Joe Perches
2014-03-07 16:53 ` Florian Vaussard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394199483-26147-1-git-send-email-florian.vaussard@epfl.ch \
--to=florian.vaussard@epfl.ch \
--cc=apw@canonical.com \
--cc=devicetree@vger.kernel.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).