From patchwork Fri Dec 15 15:38:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 122112 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp629573qgn; Fri, 15 Dec 2017 07:40:09 -0800 (PST) X-Google-Smtp-Source: ACJfBosldKg2LnlE1FW6mZHafcCmN9j7XNX6wPPjbo5/lVtBmzXEH0LXwq8ylVTSPK5P0kzroeUz X-Received: by 10.84.251.152 with SMTP id w24mr5019832pll.226.1513352409889; Fri, 15 Dec 2017 07:40:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513352409; cv=none; d=google.com; s=arc-20160816; b=g/5pTQBL3bBHk1d7ld6ziBIxmaOM8Ux5cOWCDPQZS83z3Kx+/LQaj0JIVOjJ0rV4rU n2+znD9ayxZ1mLflksVekmoVO59sGinFT/XIu5jeNmRkzXt/4stLoR8LzDDhxnmKyixI 7mc0KNRBJFKYSQ/g6nCBsb8FRbD2sOBwWgm9/7RM/WudlQGZg4X3iuuKILuLooJfVul4 91Tp70lhOwXfWn79c/WJedxXDoogmVsC31+jeImsLwL6i3L7Zxc3eF5l5UU1N47WGMD/ 1dgE2eGV8JbyV/cZx56185/QIw4DtThVNQHeoVquYV2V6TtvtAd7P5cP9uQBpdvaX6Ps TyVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=+93CRe1QV6UDLWevxoFyt2EqSRwhd5P9xQtGnhttUUU=; b=OQ/LVASpPNEh8yIvuy/GdU25wMlaJmWbVGMd0vx+P7Znyy24OCyaiJam9nre3lpsKj zCoQ+gez0OzkysMOO3edrJJOngitUioBHe9kkJvLKLX4vpaQrY8ff2XcEiYOxVnJUCS4 KIZzJAcz+MMmLkgRPQYsatSqf174Oi0dcfHx7P/dTiPdcb8gZaYMXy3l7WXRhHir3SpJ gTdft2hDXRn9E5Umvsy5h9ddjRm/AqhOLHuLjqrHU3UXRdzD/KOv3cESkbajgPjyWNv9 V4mDrx6H8CFjFPu4m2dh8AufE/PWU58xxDXcVDy4kRRvKI/yrbDbHPgtTLT8VB/68LJu eVqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=cRxYeahI; 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 b10si5340680plm.825.2017.12.15.07.40.09; Fri, 15 Dec 2017 07:40:09 -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=cRxYeahI; 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 S932437AbdLOPkG (ORCPT + 19 others); Fri, 15 Dec 2017 10:40:06 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:49790 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932189AbdLOPj7 (ORCPT ); Fri, 15 Dec 2017 10:39:59 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-07.nifty.com with ESMTP id vBFFc7nf032356; Sat, 16 Dec 2017 00:38:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com vBFFc7nf032356 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1513352290; bh=+93CRe1QV6UDLWevxoFyt2EqSRwhd5P9xQtGnhttUUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cRxYeahIBQe6sl5PIFzbenygnpHiIsORvKUnDlAYsxvxT0/8PAST5sB78riEhHrvI OsYD/jbphAvig3KBBavi633AFnee3Dh6CBKjMrWVoAZMiL1Tk9wHiQuG4xqOfkg8WW NnV/rkfw0rEO6cPljnPlZokKJHiJ+kzBx2AYasHzCCYDvDTTO07++wyMbVOiXeFzN+ EAwU3ev8dqm6XPScjj2lbjL49vT3xzZOkeMqAn8MxVeSbaqPU7y4/73x/5j2HXb1+i c3T+SUZbdOM18dE2n12eUkxkjln+goMitEyD2gbs+6bfm3x7NqDG3eFZR3B1eX4jq8 ilHUkSqG+ajxg== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Nicolas Pitre , "Luis R . Rodriguez" , Randy Dunlap , Michal Marek , Sam Ravnborg , Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] kconfig: drop 'boolean' keyword Date: Sat, 16 Dec 2017 00:38:02 +0900 Message-Id: <1513352282-4437-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513352282-4437-1-git-send-email-yamada.masahiro@socionext.com> References: <1513352282-4437-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No more users of this keyword. Drop it according to the notice by commit 6341e62b212a ("kconfig: use bool instead of boolean for type definition attributes"). Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 2 +- scripts/kconfig/kconf_id.c | 1 - scripts/kconfig/mconf.c | 2 +- scripts/kconfig/menu.c | 4 ++-- scripts/kconfig/symbol.c | 2 +- scripts/kconfig/zconf.y | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) -- 2.7.4 Acked-by: Luis R. Rodriguez diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 297b079..027f5b4 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -1123,7 +1123,7 @@ void set_all_choice_values(struct symbol *csym) bool conf_set_all_new_symbols(enum conf_def_mode mode) { struct symbol *sym, *csym; - int i, cnt, pby, pty, ptm; /* pby: probability of boolean = y + int i, cnt, pby, pty, ptm; /* pby: probability of bool = y * pty: probability of tristate = y * ptm: probability of tristate = m */ diff --git a/scripts/kconfig/kconf_id.c b/scripts/kconfig/kconf_id.c index 5abbc72..3ea9c5f 100644 --- a/scripts/kconfig/kconf_id.c +++ b/scripts/kconfig/kconf_id.c @@ -20,7 +20,6 @@ static struct kconf_id kconf_id_array[] = { { "tristate", T_TYPE, TF_COMMAND, S_TRISTATE }, { "def_tristate", T_DEFAULT, TF_COMMAND, S_TRISTATE }, { "bool", T_TYPE, TF_COMMAND, S_BOOLEAN }, - { "boolean", T_TYPE, TF_COMMAND, S_BOOLEAN }, { "def_bool", T_DEFAULT, TF_COMMAND, S_BOOLEAN }, { "int", T_TYPE, TF_COMMAND, S_INT }, { "hex", T_TYPE, TF_COMMAND, S_HEX }, diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 315ce2c..c829be8b 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -246,7 +246,7 @@ search_help[] = N_( " Selected by: BAR [=n]\n" "-----------------------------------------------------------------\n" "o The line 'Type:' shows the type of the configuration option for\n" - " this symbol (boolean, tristate, string, ...)\n" + " this symbol (bool, tristate, string, ...)\n" "o The line 'Prompt:' shows the text used in the menu structure for\n" " this symbol\n" "o The 'Defined at' line tells at what file / line number the symbol\n" diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 2baebe3..5878876 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -274,13 +274,13 @@ static void sym_check_prop(struct symbol *sym) if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE) prop_warn(prop, "config symbol '%s' uses %s, but is " - "not boolean or tristate", sym->name, use); + "not bool or tristate", sym->name, use); else if (sym2->type != S_UNKNOWN && sym2->type != S_BOOLEAN && sym2->type != S_TRISTATE) prop_warn(prop, "'%s' has wrong type. '%s' only " - "accept arguments of boolean and " + "accept arguments of bool and " "tristate type", sym2->name, use); break; case P_RANGE: diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 35e0937..23142a5 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -77,7 +77,7 @@ const char *sym_type_name(enum symbol_type type) { switch (type) { case S_BOOLEAN: - return "boolean"; + return "bool"; case S_TRISTATE: return "tristate"; case S_INT: diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 4b2cf41..dd926e0 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -623,7 +623,7 @@ static void print_symbol(FILE *out, struct menu *menu) fprintf(out, "\nconfig %s\n", sym->name); switch (sym->type) { case S_BOOLEAN: - fputs(" boolean\n", out); + fputs(" bool\n", out); break; case S_TRISTATE: fputs(" tristate\n", out);