From 4fbf32a69346afc87ac1ddceb92c860d644433f9 Mon Sep 17 00:00:00 2001 From: Florian Vaussard Date: Thu, 3 Apr 2014 14:49:25 -0700 Subject: [PATCH] checkpatch: fix spurious vendor compatible warnings 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 Cc: Joe Perches Acked-by: Rob Herring Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- scripts/checkpatch.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3b268b3f2362..75b587e8ddfd 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -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", -- 2.20.1