diff options
| author | Simon Glass <sjg@chromium.org> | 2020-06-14 10:54:08 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-07-09 18:57:22 -0600 |
| commit | 8af45b1f20f7f56a872297873f793655fe37f8e3 (patch) | |
| tree | ce002d14c6c8690a1369c573c3f932cf1524a34d | |
| parent | 5c430761e6a618032498fe294376a15a7ed1ee0b (diff) | |
| download | u-boot-8af45b1f20f7f56a872297873f793655fe37f8e3.tar.gz u-boot-8af45b1f20f7f56a872297873f793655fe37f8e3.tar.xz u-boot-8af45b1f20f7f56a872297873f793655fe37f8e3.zip | |
checkpatch: Don't warn about PREFER_IF in headers/DT files
This warning should only be displayed for C files. Fix it and update the
test.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rwxr-xr-x | scripts/checkpatch.pl | 2 | ||||
| -rw-r--r-- | tools/patman/test_checkpatch.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 9544e57352..238f12cb46 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2343,7 +2343,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): |