Commit c50fca55 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Jens Axboe
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210927140000.866249-3-masahiroy@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent df252bde

block/Kconfig

+7 −11
Original line number Diff line number Diff line
@@ -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

block/Kconfig.iosched

+0 −4
Original line number Diff line number Diff line 
# 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