From patchwork Fri Nov 30 09:15:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 152499 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3423536ljp; Fri, 30 Nov 2018 01:17:17 -0800 (PST) X-Google-Smtp-Source: AFSGD/W8m+nX7eGq2DWZ+9yBqcflToWjOiErpj2zLf3VV5wuewVogOGgCHsdIIQM1+9e6mJtvCyr X-Received: by 2002:a17:902:981:: with SMTP id 1mr4800682pln.142.1543569437074; Fri, 30 Nov 2018 01:17:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543569437; cv=none; d=google.com; s=arc-20160816; b=javN5J/vuNSuOvsngfjrWt2pHqxiF8l5jjs7+/OFRtqo3+NJh0JlLxMhxGzVKNS272 VHz00i5KHN8FR3mhC4d4cHnXkmxnUL/+h8ObUIfIaU0VdzCMifg7N4sm5HAVMHXLGTS/ 0E0wjL46ETmymyeT+dnNcl8pHBDZXo0/ah/1xPUrRDXE8ZUuEmO9fS8h7INb6J728kk2 gqzs438VbgDhzhknwf3g28AONHWEXfqe+jLbm86eeRxwIMchpWr6CSP59AhoZw5r3FJ1 bgDKUuUbrRYMTYLRnD5Qpn3ct3pMWClPaswucLBZlZoUh0MDDM2skk6hITIFVRLEFUKX 6B3A== 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=Ila7IG6OhXb9xuIrOHlsnG2ifWK5+2r1WBzDYAzsmws=; b=WaRdWhKs14yDXnkk8gqP4iL2oP2Ux2gWv0skydQfE4EcEawIxYJN27eUjFyid1Ei07 yFQQhqf+Bs1TnziwwQcDos3d9gRcKhzjeyhuuTVK9UDRWfRrp05w5m2jDksVJeeHnjTj ApqPW04HnqwgbQ3cn6c65f7l20dZu+u7WzAGx5k0bb2FMewbBOhcqyNc6gM8dhxkSbM7 gb4SLvgrsQydsqlO5Bv0qb1Iye+WLv4lsOdxMidcF+h3Jg3LllYXskmzGIrL9WpaE50X gMdHpHlslJP5XTBv3RtgaA5/y1bV6ruw4F0hY3LWw3oLiYMqEYSb2yAGi5VgssIUrLIT YzPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Gif4TJI6; 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 n8si4830817plk.9.2018.11.30.01.17.16; Fri, 30 Nov 2018 01:17:17 -0800 (PST) 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=Gif4TJI6; 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 S1726746AbeK3UZx (ORCPT + 32 others); Fri, 30 Nov 2018 15:25:53 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:53049 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726641AbeK3UZx (ORCPT ); Fri, 30 Nov 2018 15:25:53 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id wAU9GEaa028692; Fri, 30 Nov 2018 18:16:15 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wAU9GEaa028692 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1543569375; bh=Ila7IG6OhXb9xuIrOHlsnG2ifWK5+2r1WBzDYAzsmws=; h=From:To:Cc:Subject:Date:From; b=Gif4TJI61WXA20XdCFtR8WvqtE/MizphhVqSZHUA78BzkR/Ss3W4wPL6uvnu6H2bg ABzKR0tlVB78fsJnJcbV7QPsMVJECqtkYDnEc1Al1psH4hwM8c9YKH+RHD6v058bLe hxlkXtPathYat5hV3nES5jJCpVtiJFgFFQPUtQglzzenMuwRnGw6TsPaZuBX3I8/Jn hGlP0/ZMK0A8IsQ9Hrr71Jq0alR0qu6toZWoEcrk6HEy8yQjOTtgcxECQrVk5Oprfy HD6s40BUCsV6pZS0xQGhGcP/t1k5ptoZma1lJwwzTEhQN3uR+VJ3QmhvLJtWUetvQh a7zetDD7fHxag== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/5] kconfig: remove unneeded setsym label in conf_read_simple() Date: Fri, 30 Nov 2018 18:15:48 +0900 Message-Id: <1543569352-4899-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The two 'goto setsym' statements are reachable only when sym == NULL. The code below the 'setsym:' label does nothing when sym == NULL since there is just one if-block guarded by 'if (sym && ...)'. Hence, 'goto setsym' can be replaced with 'continue'. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 91d0a5c..1e35529 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -363,7 +363,7 @@ int conf_read_simple(const char *name, int def) sym = sym_find(line + 2 + strlen(CONFIG_)); if (!sym) { sym_add_change_count(1); - goto setsym; + continue; } } else { sym = sym_lookup(line + 2 + strlen(CONFIG_), 0); @@ -397,7 +397,7 @@ int conf_read_simple(const char *name, int def) sym = sym_find(line + strlen(CONFIG_)); if (!sym) { sym_add_change_count(1); - goto setsym; + continue; } } else { sym = sym_lookup(line + strlen(CONFIG_), 0); @@ -416,7 +416,7 @@ int conf_read_simple(const char *name, int def) continue; } -setsym: + if (sym && sym_is_choice_value(sym)) { struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); switch (sym->def[def].tri) {