diff mbox series

[5/5] checkpatch: Don't warn about PREFER_IF in headers/DT files

Message ID 20200614165409.158795-6-sjg@chromium.org
State Accepted
Commit 8af45b1f20f7f56a872297873f793655fe37f8e3
Headers show
Series patman: Add tests for U-Boot-specific checkpatch checks | expand

Commit Message

Simon Glass June 14, 2020, 4:54 p.m. UTC 
This warning should only be displayed for C files. Fix it and update the
test.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 scripts/checkpatch.pl           | 2 +-
 tools/patman/test_checkpatch.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index edba365651..5731cd221e 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2263,7 +2263,7 @@  sub u_boot_line {
 	}
 
 	# use if instead of #if
-	if ($line =~ /^\+#if.*CONFIG.*/) {
+	if ($realfile =~ /\.c$/ && $line =~ /^\+#if.*CONFIG.*/) {
 		WARN("PREFER_IF",
 		     "Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible\n" . $herecurr);
 	}
diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py
index 710b4a7d88..c9580adb54 100644
--- a/tools/patman/test_checkpatch.py
+++ b/tools/patman/test_checkpatch.py
@@ -388,6 +388,8 @@  index 0000000..2234c87
         """Test for Use the livetree API"""
         pm = PatchMaker()
         pm.add_line('common/main.c', '#ifdef CONFIG_YELLOW')
+        pm.add_line('common/init.h', '#ifdef CONFIG_YELLOW')
+        pm.add_line('fred.dtsi', '#ifdef CONFIG_YELLOW')
         self.checkSingleMessage(pm, "PREFER_IF")
 
     def testCommandUseDefconfig(self):