hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Masahiro Yamada 2021-09-27 22:59:58 +09:00 committed by Jens Axboe
parent df252bde82
commit c50fca55d4
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
block/Kconfig
View File

@ -196,33 +196,29 @@ source "block/partitions/Kconfig"
endmenu endmenu
endif # BLOCK
config BLOCK_COMPAT config BLOCK_COMPAT
bool def_bool COMPAT
depends on BLOCK && COMPAT
default y
config BLK_MQ_PCI config BLK_MQ_PCI
bool def_bool PCI
depends on BLOCK && PCI
default y
config BLK_MQ_VIRTIO config BLK_MQ_VIRTIO
bool bool
depends on BLOCK && VIRTIO depends on VIRTIO
default y default y
config BLK_MQ_RDMA config BLK_MQ_RDMA
bool bool
depends on BLOCK && INFINIBAND depends on INFINIBAND
default y default y
config BLK_PM config BLK_PM
def_bool BLOCK && PM def_bool PM
# do not use in new code # do not use in new code
config BLOCK_HOLDER_DEPRECATED config BLOCK_HOLDER_DEPRECATED
bool bool
source "block/Kconfig.iosched" source "block/Kconfig.iosched"
endif # BLOCK

4
block/Kconfig.iosched
View File

@ -1,6 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
if BLOCK
menu "IO Schedulers" menu "IO Schedulers"
config MQ_IOSCHED_DEADLINE config MQ_IOSCHED_DEADLINE
@ -45,5 +43,3 @@ config BFQ_CGROUP_DEBUG
files in a cgroup which can be useful for debugging. files in a cgroup which can be useful for debugging.
endmenu endmenu
endif