Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-26 12:27:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This warning should only be displayed for C files. Fix it and update the
test.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-06-14 10:54:08 -06:00
parent 5c430761e6
commit 8af45b1f20
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/checkpatch.pl
View file

@ -2343,7 +2343,7 @@ sub u_boot_line {
} }
# use if instead of #if # use if instead of #if
if ($line =~ /^\+#if.*CONFIG.*/) { if ($realfile =~ /\.c$/ && $line =~ /^\+#if.*CONFIG.*/) {
WARN("PREFER_IF", WARN("PREFER_IF",
"Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible\n" . $herecurr); "Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible\n" . $herecurr);
} }

2
tools/patman/test_checkpatch.py
View file

@ -388,6 +388,8 @@ index 0000000..2234c87
"""Test for Use the livetree API""" """Test for Use the livetree API"""
pm = PatchMaker() pm = PatchMaker()
pm.add_line('common/main.c', '#ifdef CONFIG_YELLOW') 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") self.checkSingleMessage(pm, "PREFER_IF")
def testCommandUseDefconfig(self): def testCommandUseDefconfig(self):