From: Joe Perches <j...@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 <j...@perches.com>
[florian.vauss...@epfl.ch: split patch, commit log]
Signed-off-by: Florian Vaussard <florian.vauss...@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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to