From patchwork Thu Jul 11 07:33:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 168833 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp11018625ilk; Thu, 11 Jul 2019 00:33:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqw898q6RzKuPDNh4m9/B44YcdQgvydAR8msNy1YkvpWfhHKmul9LlIjgoTmHNAzXIRuTHcQ X-Received: by 2002:a17:90a:7d09:: with SMTP id g9mr3139029pjl.38.1562830427738; Thu, 11 Jul 2019 00:33:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562830427; cv=none; d=google.com; s=arc-20160816; b=ypb5cRwuohTnsIcGQJ8wpUBV1P3UHKfG5a04ljodGy4yaki82y+GPn8EBsMHUP95cx QEBY8CnbgcCsmLNN/ZvswkTwfiLNUpubp4GbWlGPl4nHYKUSdegoZ451j/b4V8wMx/fC Vgr1oGUaFDcatG6x1/jWV5yvnKqlQtk1MpfpcbIg+cZlGwJyf2rnA+2m8jpfZh/sMpgF 5TZSenYaMdxmFsWhsuVAzwiDqpVfI6ZDW/pPA/CCJT8un8gkt3g7jJWx906kAUbFXd00 Bi4GFCiLplFICopcPPkY1dlVy0UQNuPtp9COEBX4qLiofZer2Rw4DS5NIplQNMhuP0km cDGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=MZwpBJbLH3Ic2lOMoV20H/PdiklfdpBShYF4i0kx/jY=; b=1KEDIsrkVVFPjlCDmjfutiq85QJPHdGLkfewNgT+jR0BXIFE15c0DPBcXvPsNlgGDn EnWCo09/9l13EEMEnNIXJTAy4xl92MzjHFmxu6Aj8Iz2CM0vDFe0BWB7q/3+UN+O2r1K Ryw7SS2MHHXNLjJKy7bsuBL4YA89W5Azg2cudbQzQKzgssSsajkLfnm6ggrgtK+z+SN8 sbmNOLtwbOgO1piJoPG9siKTsGf6EEYvvHo0552LyQx0BZbBN1+zoLzzYkrT9YkpmEEC /Rd3CDKWltZ1AmhpU2C44VtuKDvl6nzdf69Ty1xx+R/GoUvTU1zN77TIvrgEun+5vX29 i8Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=TxPpOXLv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g13si4686922pgp.405.2019.07.11.00.33.47; Thu, 11 Jul 2019 00:33:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=TxPpOXLv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728197AbfGKHdp (ORCPT + 29 others); Thu, 11 Jul 2019 03:33:45 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:19441 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726088AbfGKHdp (ORCPT ); Thu, 11 Jul 2019 03:33:45 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id x6B7XLLw018488; Thu, 11 Jul 2019 16:33:21 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x6B7XLLw018488 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562830401; bh=MZwpBJbLH3Ic2lOMoV20H/PdiklfdpBShYF4i0kx/jY=; h=From:To:Cc:Subject:Date:From; b=TxPpOXLvSm8MuBuO12dsz6WyNZhNuRu1ZNCwJvVMLbytDWVRfMccvOILi+80lmCO2 u+cxOu/nnDO8iscotHKgqOuNgwmPargDzjCorEZ9g3d1A0TzmaiP7QpkHx6eQgxHSO teqYoGKcxZHNOUSPlWTSVqjQ8vduuaszTDUZasdcDPfUfGui74yhbOMMCsrB67Rle0 HTc3A6HaGpGjIAowXaef9BiWrSPbYTlENLmoeYnbiWfInHouC9AgweRgEGMeCYdkqc sqshB1FtKtZ2yu9pKnr5Xv462ed4U9nAjw9mWM34LrKTNwwV5/r/ZUgi5+heuGROiu Hzn4FSEjbWeYQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] kconfig: remove meaningless if-conditional in conf_read() Date: Thu, 11 Jul 2019 16:33:17 +0900 Message-Id: <20190711073317.27248-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sym_is_choice(sym) has already been checked by previous if-block: if (sym_is_choice(sym) || (sym->flags & SYMBOL_NO_WRITE)) continue; Hence, the following code is redundant, and the comment is misleading: if (!sym_is_choice(sym)) continue; /* fall through */ It always takes 'continue', never falls though. Clean up the dead code. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 18e8051d89d7..cbb6efa4a5a6 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -534,11 +534,9 @@ int conf_read(const char *name) switch (sym->type) { case S_BOOLEAN: case S_TRISTATE: - if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym)) - break; - if (!sym_is_choice(sym)) + if (sym->def[S_DEF_USER].tri == sym_get_tristate_value(sym)) continue; - /* fall through */ + break; default: if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val)) continue;