block: simplify Kconfig files

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 <masahiroy@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210927140000.866249-3-masahiroy@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/Kconfig b/block/Kconfig
index 1d83504749e755824e5c86247c3a5f0b690f9a8a..c4d35829ea4f1a410fb393f84c515113357b5e4d 100644 (file)
--- 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 2f2158e05a91c1eaa85bdaa142e33a1748441d65..885fee86dfcae4e12c91c354c42d4a9bdd66a56e 100644 (file)
--- 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