Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp3986251pxb; Mon, 27 Sep 2021 07:06:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+CLSJKRVNJLJwQY5FQ7Yano1yien3gAG1xNsJrJySwKXJItowjo0R/gQBXFdut9JU3q4y X-Received: by 2002:a17:906:a018:: with SMTP id p24mr188655ejy.349.1632751570707; Mon, 27 Sep 2021 07:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632751570; cv=none; d=google.com; s=arc-20160816; b=GPBxEberNaQabhCw+m4LM5qBDLVbyFVg59rExObg8vU31ioVeXc5OgbJ03cH9trHXh gjVzNgFDYMcJtFU1TLjgRuuFdt9V6srvSfudktm9KNeb1V9l3rGzMJu0KEGVGpI8miKs b4+0EycK65mg4RnyIfsZJokO2omcIM32wnFL2BnV9R5Z6oJ4TYBdoViLtlTSJ7IjnD0B lmTa0GTZhsAF1HNkmVvk4gCx530sStKe1HEFD+BVsyg1wTDjqztKudyNyW0a1HJlPSqi yurWA5t/PpKpj2g0mzHRj2v+/lzT3Z1a6F+jd0SNlv5Y+0hJ2jcd6wd1sMEK6n4ffR5Y X2XQ== 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:dkim-filter; bh=KxbFoC0Lpctbe3+9vWMEemrZDfcQA9Rb6dRZ6EUnmN4=; b=wX06ECq0QUijfynQUELh/0C0/GtqQFm6DN+w/7ud4bkkuFCeLmV3OzATfoFDJCEe5o PoRRrlBGwuiSBAzE3++pTDMZDmR7YXzu+4r5/fHti85dCgeR8JKkamh5Jwm0qqSnaADf LGXm8Qa+jtSoZnHsI0boUENXCHhZLVDNbafHJ3JQIqZ2IUxrHhpDZ9Gltc/irQpeBYlR YApIdpqIv62FScKZ/zNOBKJMIi87ULObCgIKEeto4ej4icX9ofy+JYBphZxWWkXZ8KnM S93oxQ+3RGqRNhI11oVYyv9bgCblnRkRap5Fj96jDpX71HQm1idkbJaO9ln3E1ZmTIft KmqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=w2uoKVUT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m29si19435206eda.423.2021.09.27.07.05.45; Mon, 27 Sep 2021 07:06:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=w2uoKVUT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235007AbhI0OCu (ORCPT + 99 others); Mon, 27 Sep 2021 10:02:50 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:64359 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234900AbhI0OCO (ORCPT ); Mon, 27 Sep 2021 10:02:14 -0400 Received: from grover.. (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-10.nifty.com with ESMTP id 18RE07Fx028280; Mon, 27 Sep 2021 23:00:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 18RE07Fx028280 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1632751209; bh=KxbFoC0Lpctbe3+9vWMEemrZDfcQA9Rb6dRZ6EUnmN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w2uoKVUTSU6/9ZgiEyItEKglzN9eATvYKW++xnVmz7Ez2/OrrcovgQgaPv/BcXCgC 1Z8FS6Q3PqP16lOq1SC/UfNCn8O+/SnighzVhNhpI/xvq+wldKLGpgimwqt5AHPshh M0ET1ejypJExn+qmHWdyJu+PpRVmc48SZ8GWLzHnjTabfbbMLVYfe2+kyNAiUtB9yy YbGirCrO9prEl5ZnVtJRAOMwbp2JMwfqVa5IhQsr6k1GqtXCFWneB8IQr7PPl1G47z O6v6LhEiWb2egUvdSeEjXp468iPh2/CoCE285fHrz2b+WcN5IJAbtSS4iulaUkehrx z3m9vi7irYnbg== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: Jens Axboe , linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [RESEND PATCH 2/4] block: simplify Kconfig files Date: Mon, 27 Sep 2021 22:59:58 +0900 Message-Id: <20210927140000.866249-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210927140000.866249-1-masahiroy@kernel.org> References: <20210927140000.866249-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Everything under block/ depends on BLOCK. BLOCK_HOLDER_DEPRECATED is selected from drivers/md/Kconfig, which is entirely dependent on BLOCK. Extend the 'if BLOCK' ... 'endif' so it covers the whole block/Kconfig. Also, clean up the definition of BLOCK_COMPAT and BLK_MQ_PCI because COMPAT and PCI are boolean. Signed-off-by: Masahiro Yamada --- block/Kconfig | 18 +++++++----------- block/Kconfig.iosched | 4 ---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/block/Kconfig b/block/Kconfig index 1d83504749e7..c4d35829ea4f 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -196,33 +196,29 @@ source "block/partitions/Kconfig" endmenu -endif # BLOCK - config BLOCK_COMPAT - bool - depends on BLOCK && COMPAT - default y + def_bool COMPAT config BLK_MQ_PCI - bool - depends on BLOCK && PCI - default y + def_bool PCI config BLK_MQ_VIRTIO bool - depends on BLOCK && VIRTIO + depends on VIRTIO default y config BLK_MQ_RDMA bool - depends on BLOCK && INFINIBAND + depends on INFINIBAND default y config BLK_PM - def_bool BLOCK && PM + def_bool PM # do not use in new code config BLOCK_HOLDER_DEPRECATED bool source "block/Kconfig.iosched" + +endif # BLOCK diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched index 2f2158e05a91..885fee86dfca 100644 --- a/block/Kconfig.iosched +++ b/block/Kconfig.iosched @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -if BLOCK - menu "IO Schedulers" config MQ_IOSCHED_DEADLINE @@ -45,5 +43,3 @@ config BFQ_CGROUP_DEBUG files in a cgroup which can be useful for debugging. endmenu - -endif -- 2.30.2