From patchwork Fri Dec 15 15:38:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 122113 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp629852qgn; Fri, 15 Dec 2017 07:40:25 -0800 (PST) X-Google-Smtp-Source: ACJfBounz/SXjfSzLSp/JIY3FCQrkl25mI73URj40jERnS9uKw66MM4dIyXskNaZ+uSsZBjx24pc X-Received: by 10.98.139.138 with SMTP id e10mr13760018pfl.231.1513352425073; Fri, 15 Dec 2017 07:40:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513352425; cv=none; d=google.com; s=arc-20160816; b=BSCgGQR4ZsgZ14AfW4+HXj50/4P407hnwKKSc2rXqxrG6yloY8qonC4Ii/Mz0b5LUV 2eg1lzJtgDdXSFL64GsVmYPq/9/D4HWLBZh1NG2Q1sxwnpdb/9ymOEdAdOY36Zr/ATlM 9KI2vKHo7dWeXbbV+LcUUQvngeGy53pm/D+LZagPJb8DCqLaZ/rNe+rE5E+QaHSmSFi/ cD9/9f/JJbxtgYN6NtfXAC8nRg8Rc1Q9TmTrjsRCd+AOXR/olmK0zbrZ4KNtapyiKweA 30w3HG6rAMLClFuP5m6UpZpLUUTI3L6RcZaKI+wPw0Hbu2NZvPQt/KEXfb/3gWQaL4IM vIoA== 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:arc-authentication-results; bh=K80ZBVEtnIW3iH44hH84FlMQxCyxJ3ytuaG7nocfsek=; b=GZK3RSwv3MH+L2z2KOXRNdhXk+xe13td3r09ohvEHTnUh4lfvkxT15FHa4lrpPetNX +zSV/lNv8tiPritwPF14UWjDH0FNIUkNfm79oNEso34FNFBRT6w4809L/9zhRkc6uhKs iMFlOJPnwzQ/3dUftGlRU96o5p+mfXnIfI9oT8zr1+3PeUVo/RZeHEhAmmErSo5tngj1 HY8EPFAyOUFrLtc3asiM3BgNdfLlSJXesfgpuGkcyB0ueBOM2AMPTXfr7i9K+wHb8VvQ K9gSkaknz8h6AUBHL1+figHy0l6T00pM8CrNu0R7F1FF0akiwG2fZPNh/euOKx+2NiRv 3r7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=i3FjZssj; 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 e7si4732851pgt.15.2017.12.15.07.40.24; Fri, 15 Dec 2017 07:40:25 -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=i3FjZssj; 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 S932486AbdLOPkV (ORCPT + 19 others); Fri, 15 Dec 2017 10:40:21 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:50087 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932244AbdLOPkO (ORCPT ); Fri, 15 Dec 2017 10:40:14 -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 vBFFc7ne032356; Sat, 16 Dec 2017 00:38:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com vBFFc7ne032356 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1513352289; bh=K80ZBVEtnIW3iH44hH84FlMQxCyxJ3ytuaG7nocfsek=; h=From:To:Cc:Subject:Date:From; b=i3FjZssjBM2azAP0DoQb9NYrcSWUf2AjYwWrhZelcwShyNHWK6QKj6NSh1O8PGFXv 4LMgd2Oz9SeIFqrF6FY8X8lvE5pGTQ7UzkR+pIjEFDlz712HyqRqHlQg2v5TQjH1eJ kw5Hrb+nGUJlSw8M47S/clSUgu+ZwJR1R8jvNwFAWlbiWiJ0siZKuYqOM75B2j0oRU FumOe0sKzgMrra1e2s4bP290urcNMBjydSIUB1EuLgOpWFFKhluk5Rwwv/TvEspzee R71KExyNI9GwcYqPgdI7b7OGa7aJ6HoBn523EFQ/OhpiZCseB/Nei0b2OmKBLvgRZ5 ofbsk2bV1k8Ug== 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 , devel@driverdev.osuosl.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Matt Fleming , Greg Kroah-Hartman , Ard Biesheuvel Subject: [PATCH 1/2] kconfig: use bool instead of boolean for type definition attributes, again Date: Sat, 16 Dec 2017 00:38:01 +0900 Message-Id: <1513352282-4437-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 Commit 6341e62b212a ("kconfig: use bool instead of boolean for type definition attributes") did treewide replacement of 'boolean', and also mentioned the keyword 'boolean' would be dropped later on. Some years have passed, but it has not happened yet. Meanwhile, some new instances have come up. I am really going to drop this keyword. I need to do the replacement once again. Signed-off-by: Masahiro Yamada --- drivers/firmware/efi/Kconfig | 2 +- drivers/staging/rtlwifi/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index 2b4c39f..3abdda1 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -113,7 +113,7 @@ config EFI_CAPSULE_LOADER Most users should say N. config EFI_CAPSULE_QUIRK_QUARK_CSH - boolean "Add support for Quark capsules with non-standard headers" + bool "Add support for Quark capsules with non-standard headers" depends on X86 && !64BIT select EFI_CAPSULE_LOADER default y diff --git a/drivers/staging/rtlwifi/Kconfig b/drivers/staging/rtlwifi/Kconfig index cb3a29a..12cf467 100644 --- a/drivers/staging/rtlwifi/Kconfig +++ b/drivers/staging/rtlwifi/Kconfig @@ -17,6 +17,6 @@ config RTLPHYDM_ST default m config RTLWIFI_DEBUG_ST - boolean + bool depends on R8822BE default y 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);