checkpatch: fix spurious vendor compatible warnings
authorFlorian Vaussard <[email protected]>
Thu, 3 Apr 2014 21:49:25 +0000 (14:49 -0700)
committerLinus Torvalds <[email protected]>
Thu, 3 Apr 2014 23:21:14 +0000 (16:21 -0700)
With a compatible string like

  compatible = "foo";

checkpatch will currently try to find "foo" in vendor-prefixes.txt,
which is wrong since the vendor prefix is empty in this specific case.

Skip the vendor test if the compatible is not like

  compatible = "vendor,something";

Signed-off-by: Florian Vaussard <[email protected]>
Cc: Joe Perches <[email protected]>
Acked-by: Rob Herring <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
scripts/checkpatch.pl

index 3b268b3f23627e092e9570636712f9fcd7e64a13..75b587e8ddfdcaa53ad7697359564cab617eb102 100755 (executable)
@@ -2088,10 +2088,10 @@ sub process {
                                             "DT compatible string \"$compat\" appears un-documented -- check $dt_path\n" . $herecurr);
                                }
 
-                               my $vendor = $compat;
                                my $vendor_path = $dt_path . "vendor-prefixes.txt";
                                next if (! -f $vendor_path);
-                               $vendor =~ s/^([a-zA-Z0-9\-]+)\,.*/$1/;
+                               next if $compat !~ /^([a-zA-Z0-9\-]+)\,/;
+                               my $vendor = $1;
                                `grep -Eq "$vendor" $vendor_path`;
                                if ( $? >> 8 ) {
                                        WARN("UNDOCUMENTED_DT_STRING",