From patchwork Sat Nov 18 07:59:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 166463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1047794vqn; Fri, 17 Nov 2023 23:59:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IE6alTkBo2HtvJ3XtuCrAxisRgaxaOeFQ1OAfMdFAA/jh8tE32+9s3qvKnmjzq/1tQ5WR+n X-Received: by 2002:a05:6808:1642:b0:3a9:6400:62c6 with SMTP id az2-20020a056808164200b003a9640062c6mr2178612oib.32.1700294369204; Fri, 17 Nov 2023 23:59:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700294369; cv=none; d=google.com; s=arc-20160816; b=J7uPLKe/ciFvvg02IdgvPakEsslkygqQyiaUbT9HfuzpFYX+x7jjnu/oiEXuOf7lKw DRtWuF3SVRuPLkAQzObgvd/YVmwm/YrWUzxvMM26pekGMvtd7WOwApXGerkj6X8MhoVG lFLRrLCCyAzQFmZj6jNPfuFtfieUm0VSmB2aqKTZkAWYAsTjBy8EkDENghmRkCyCrMoA P5Auzte0RchyEADIRq4PE89yoT84IXpdHtpinRnmKHt3NrSP1x6jRKwW0Ik8OjNm642m c7bOQfNhfWl7V6eSjFZG8nOBzbSRGzuTrmALtWrg3x2SL3CwtksNjJUkmYO1ZGimRpqP HIgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FgXQ+abnTp0XfrndIyZoalk5f4nJkzbj2e7m6+UyoZU=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=LEbQ3BGwz4hlbYmsLeytl8/zdaUL22ZNS0eFmXyxKHyeu475tCrv28iiTTjixZJ10s F/cJ8Or2m6lW1zoE0GwuqSlTP1uIvIzkpagbl/eEBi9AuCekTKCrNq9uWC3BgU4tqlrM nce7ymTlVT6MgoI6f+K8oxd6hL67BXiqUv0+ttk+Xrt+LlBXJKnoQDpRLxkwBWjqLIOW X1rqvhn3T1MNXvCqF6xQ+VH9sd0rIDA8BolHwbaMjlPXzo1Bo4zBT9R8kyRCpAUr3Nay 2KSARzbdmGrSs4rMGzm+1j/wJkOsRxeSkHPjBBwM3dyPJG6bLvEjUjQzlyUPBLqAkP3f fFHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PjbwH44S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id l12-20020a170903120c00b001c61bdd8e89si3905978plh.150.2023.11.17.23.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 23:59:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PjbwH44S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 7D3B982AE2C1; Fri, 17 Nov 2023 23:59:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232457AbjKRH7X (ORCPT + 29 others); Sat, 18 Nov 2023 02:59:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231782AbjKRH7V (ORCPT ); Sat, 18 Nov 2023 02:59:21 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FD27D5C for ; Fri, 17 Nov 2023 23:59:18 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28B26C433C8; Sat, 18 Nov 2023 07:59:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700294357; bh=jauAd/DlIAxGRDHMhsV9eiDiF6QyHtLCAz+l36D7zjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PjbwH44S8XJsybJbgN1uXro8sSssuv0tAW825PLtyijhAG8M7czDA+DWYy0tkE0Nf HHXKNdJn3E0ejeHOTC8pQ8gE5pJjf86hCY2uJTVB/OWyu/SGCjORkJP2iITAViUTZv mYekF/H72wCwzdaf3/RzGh9DqO7hMY6P73YYkRVuNYUf3sBajQsvlKU7ujoc9sI4A4 kMwzbSPn/xf63v8TA+if0Xu0f8O+CrwyDl2Ns212Og0+48tyv6CkJ1vi/a+19lLkqf +mOU7YfpRHhm+kwJT7ikG5lOCRPJTHxgdflgisJAjZXabCJO0PvQX36EHw5XKQJiRX PsCS1nbyqmKfg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 2/6] kconfig: remove unused code for S_DEF_AUTO in conf_read_simple() Date: Sat, 18 Nov 2023 16:59:08 +0900 Message-Id: <20231118075912.1303509-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231118075912.1303509-1-masahiroy@kernel.org> References: <20231118075912.1303509-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 23:59:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782887868108057963 X-GMAIL-MSGID: 1782887868108057963 The 'else' arm here is unreachable in practical use cases. include/config/auto.conf does not include "# CONFIG_... is not set" line unless it is manually hacked. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 556b7f087dbb..92e8e37aca4d 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -436,20 +436,15 @@ int conf_read_simple(const char *name, int def) *p++ = 0; if (strncmp(p, "is not set", 10)) continue; - if (def == S_DEF_USER) { - sym = sym_find(line + 2 + strlen(CONFIG_)); - if (!sym) { - if (warn_unknown) - conf_warning("unknown symbol: %s", - line + 2 + strlen(CONFIG_)); - conf_set_changed(true); - continue; - } - } else { - sym = sym_lookup(line + 2 + strlen(CONFIG_), 0); - if (sym->type == S_UNKNOWN) - sym->type = S_BOOLEAN; + sym = sym_find(line + 2 + strlen(CONFIG_)); + if (!sym) { + if (warn_unknown) + conf_warning("unknown symbol: %s", + line + 2 + strlen(CONFIG_)); + + conf_set_changed(true); + continue; } if (sym->flags & def_flags) { conf_warning("override: reassigning to symbol %s", sym->name);