[PATCH] checkpatch: add judgment condition for Kconfig help test

From: Cixi Geng
Date: Thu Nov 16 2023 - 10:47:37 EST


From: Cixi Geng <cixi.geng1@xxxxxxxxxx>

The has_help only counted the situation which the patch file add
a help line, when the config was renamed and modify description,
the has_help is zero for the "help" line not added.

here is one case:
the modify file: drivers/iio/adc/Kconfig line(1047)

-config SC27XX_ADC
+config SPRD_ADC
tristate "Spreadtrum SC27xx series PMICs ADC"
depends on MFD_SC27XX_PMIC || COMPILE_TEST
+ depends on ARCH_SPRD
help
- Say yes here to build support for the integrated ADC inside the
- Spreadtrum SC27xx series PMICs.
+ Say yes here to build support for the integrated ADC inside of the
+ Spreadtrum SC27xx and UMPxx series PMICs.

This driver can also be built as a module. If so, the module
will be called sc27xx_adc.

the checkpatch result:
WARNING: please write a help paragraph that fully describes the config symbol
#23: FILE: drivers/iio/adc/Kconfig:1050:
+config SPRD_ADC
+ tristate "Spreadtrum's ADC PMICs driver"
depends on MFD_SC27XX_PMIC || COMPILE_TEST
+ depends on ARCH_SPRD
help
+ Say yes here to build support for the integrated ADC inside of the
+ Say yes here to build support for the integrated ADC inside of the
+ Say yes here to build support for the integrated ADC inside of the
+ Spreadtrum SC27xx and UMPxx series PMICs.

This driver can also be built as a module. If so, the module
will be called sc27xx_adc.

total: 0 errors, 1 warnings, 17 lines checked

Fixes: b8709bce9089 ("checkpatch: improve Kconfig help test")
Signed-off-by: Cixi Geng <cixi.geng1@xxxxxxxxxx>
---
scripts/checkpatch.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 25fdb7fda112..402009d08505 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3616,7 +3616,7 @@ sub process {
$needs_help = 1;
next;
}
- if ($f =~ /^\+\s*help\s*$/) {
+ if ($f =~ /^\+\s*help\s*$/ || $f =~ /^\s*help\s*$/) {
$has_help = 1;
next;
}
--
2.34.1