From patchwork Wed Jun 17 03:02:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11608927 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54240912 for ; Wed, 17 Jun 2020 03:03:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3BA172073E for ; Wed, 17 Jun 2020 03:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592362987; bh=0XQdAo7D9V05u0EjI4o08ew6BaPvVrhKst/c4K0zI8c=; h=From:To:Cc:Subject:Date:List-ID:From; b=R8GEcr8+P0F/1HR/3cqm4X+XtfUIPQfpNIHPbkyEj779febAhXIqHWwiC5KkOPtDC R0oUkoZOaw+IPpijpaO3zCIyWimSmOEPQEejLTqTOlDpEpOGvh7zSQNhS5xGRWlqJG JoCxKWl8zj0qVmAgKdPBUQx10FEITzEnL4gxX8P8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726505AbgFQDDD (ORCPT ); Tue, 16 Jun 2020 23:03:03 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:28958 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbgFQDDC (ORCPT ); Tue, 16 Jun 2020 23:03:02 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-07.nifty.com with ESMTP id 05H32LoY025819; Wed, 17 Jun 2020 12:02:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 05H32LoY025819 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1592362942; bh=n4BOvCL3VxfQ4qh288Bu9Yi/iN3FN1ZloktmANtPxcg=; h=From:To:Cc:Subject:Date:From; b=OTkXom9v24+IDxdrw1mKTS1+QLOF6LWBfjFL7WvNCL3UNlJc2Z/KQSYkEr4uUaf6Y 5jQQktEGvRleEj8ei8EqqOxxKOlxCyrT5OiHfY+ptC/T75JQmr6NtZhbCKeZ0BF/Oh VXBPil94IHI89FC7UTGpoM/IM15lC2xn8ZzOt+z4A+hpeACDHOpBHOLFAX4vHYfIA0 K9TfxD8SIzWr6afct6EnJnQ9n4D4j2jFOLv3qN7DLoQtvM+oXVsrnTFwff7dRtsPBT FpcLe6fRClZXcmn0b5pv5Mx05NysNfgoGMGITNHtVybDeXwu7ohthArl3MAD4+OoVF AcrppUtocqx7w== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Ulf Magnusson , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] kconfig: remove '---help---' support Date: Wed, 17 Jun 2020 12:02:19 +0900 Message-Id: <20200617030220.34733-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The conversion is done. No more user of '---help---'. Cc: Ulf Magnusson Signed-off-by: Masahiro Yamada --- scripts/checkkconfigsymbols.py | 2 +- scripts/kconfig/lexer.l | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py index 00a10a293f4f..1548f9ce4682 100755 --- a/scripts/checkkconfigsymbols.py +++ b/scripts/checkkconfigsymbols.py @@ -34,7 +34,7 @@ REGEX_SOURCE_SYMBOL = re.compile(SOURCE_SYMBOL) REGEX_KCONFIG_DEF = re.compile(DEF) REGEX_KCONFIG_EXPR = re.compile(EXPR) REGEX_KCONFIG_STMT = re.compile(STMT) -REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$") +REGEX_KCONFIG_HELP = re.compile(r"^\s+help\s*$") REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$") REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+") REGEX_QUOTES = re.compile("(\"(.*?)\")") diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l index 6354c905b006..4b7339ff4c8b 100644 --- a/scripts/kconfig/lexer.l +++ b/scripts/kconfig/lexer.l @@ -105,7 +105,7 @@ n [A-Za-z0-9_-] "endchoice" return T_ENDCHOICE; "endif" return T_ENDIF; "endmenu" return T_ENDMENU; -"help"|"---help---" return T_HELP; +"help" return T_HELP; "hex" return T_HEX; "if" return T_IF; "imply" return T_IMPLY; From patchwork Wed Jun 17 03:02:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11608929 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A223A1392 for ; Wed, 17 Jun 2020 03:03:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F3692073E for ; Wed, 17 Jun 2020 03:03:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592362990; bh=1AuXE0AAF86VUd3jXxzGmd2N1POihuB1AuHzjiEobZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TkzJFPwNnI5LL8+P1htgRe/0bioJBiAiwqjZIVHsRbZHVDA7xaGOE3v0mR9RE32Nw WiKatjYbjm9S89MqCdyo8u6Znw+EfZIutUfFfcNHY8+O5es7xzAWadt+MDxByQxsJK XNwKo4T83u7s7lMGIGCUe73Q8R+YEAFHLLJ+lptI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726715AbgFQDDK (ORCPT ); Tue, 16 Jun 2020 23:03:10 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:29153 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbgFQDDJ (ORCPT ); Tue, 16 Jun 2020 23:03:09 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-07.nifty.com with ESMTP id 05H32LoZ025819; Wed, 17 Jun 2020 12:02:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 05H32LoZ025819 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1592362943; bh=yKXR0cT/+VFFEJJCIIRrJfsD75s0u6/WxSSRzJbVNo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WKh9kho36Ns2SluPZe5tStpRhrfuz/buZZkAaL/VHccZLC1xvI3oNLFNJIZRTaYjl usEpZsEVV964pZb78zlQ+flLoVNGMotkVtJbvqP0y+/7Fm5C8gp+z7cje1PfB+Zs9O N+N3BhIPXZ4rn0H+3s47rinM9uGoblCUivKeqZFuzH0SO5w846Eug2Lkfc46V0HAHx VtT6J8fNEE5EvP0sav7PvKkDRDACMB/n4RjNBc+2ywCz+R9UzTtLff9ZF+b7l+EnC3 mLJjkIhDc5PM29pzK0NkOtZ1MTt/cAALr3w0yL8u2pYNCrXivHNaBTmWlRV1J7xopi RwN0brUiyDDdQ== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Ulf Magnusson , Andy Whitcroft , Joe Perches , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] Revert "checkpatch: kconfig: prefer 'help' over '---help---'" Date: Wed, 17 Jun 2020 12:02:20 +0900 Message-Id: <20200617030220.34733-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617030220.34733-1-masahiroy@kernel.org> References: <20200617030220.34733-1-masahiroy@kernel.org> MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This reverts commit 84af7a6194e493fae312a2b7fa5a3b51f76d9282. The conversion is done. Cc: Ulf Magnusson Signed-off-by: Masahiro Yamada --- scripts/checkpatch.pl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 4c820607540b..1351e052eb99 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3042,11 +3042,7 @@ sub process { if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) { $is_start = 1; - } elsif ($lines[$ln - 1] =~ /^\+\s*(?:help|---help---)\s*$/) { - if ($lines[$ln - 1] =~ "---help---") { - WARN("CONFIG_DESCRIPTION", - "prefer 'help' over '---help---' for new help texts\n" . $herecurr); - } + } elsif ($lines[$ln - 1] =~ /^\+\s*(?:---)?help(?:---)?$/) { $length = -1; }