MIPS: configs: Cleanup old Kconfig options

PATCH Applied Krzysztof Kozlowski 2 participants 2 messages Feb 17, 2020 – Feb 19, 2020 MIPS

Share & tools

Krzysztof Kozlowski

author

2020-02-17 16:56 UTC #0 lore raw

PATCH v2 1/1 MIPS: configs: Cleanup old Kconfig options

CONFIG_MTD_NAND_IDS is gone and not needed (part of CONFIG_MTD_NAND) since commit f16bd7ca0457 ("mtd: nand: Kill the MTD_NAND_IDS Kconfig option").

CONFIG_IOSCHED_DEADLINE, CONFIG_IOSCHED_CFQ and CONFIG_DEFAULT_NOOP are gone since commit f382fb0bcef4 ("block: remove legacy IO schedulers").

The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be now enabled by default (along with MQ_IOSCHED_KYBER).

The BFQ_GROUP_IOSCHED is the only multiqueue scheduler which comes with group scheduling so select it in configs previously choosing CFQ_GROUP_IOSCHED.

Signed-off-by Krzysztof Kozlowski <[email protected]>

Reviewed-by Philippe Mathieu-Daudé <[email protected]>

---

Changes since v1:
1. Add Philippe's review.

---
 arch/mips/configs/ar7_defconfig                 | 1 -
 arch/mips/configs/ath25_defconfig               | 1 -
 arch/mips/configs/ath79_defconfig               | 1 -
 arch/mips/configs/bcm63xx_defconfig             | 2 --
 arch/mips/configs/bmips_be_defconfig            | 2 --
 arch/mips/configs/bmips_stb_defconfig           | 2 --
 arch/mips/configs/db1xxx_defconfig              | 1 -
 arch/mips/configs/generic/board-ni169445.config | 1 -
 arch/mips/configs/lasat_defconfig               | 2 --
 arch/mips/configs/lemote2f_defconfig            | 2 +-
 arch/mips/configs/loongson3_defconfig           | 5 +++--
 arch/mips/configs/msp71xx_defconfig             | 2 --
 arch/mips/configs/pnx8335_stb225_defconfig      | 2 --
 arch/mips/configs/rb532_defconfig               | 1 -
 arch/mips/configs/rt305x_defconfig              | 1 -
 arch/mips/configs/xway_defconfig                | 1 -
 16 files changed, 4 insertions(+), 23 deletions(-)

arch/mips/configs/ar7_defconfig +0 -1

index cef2754bd408..cf9c6329b807 100644
@@ -21,7 +21,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_BSD_DISKLABEL=y
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y

arch/mips/configs/ath25_defconfig +0 -1

index c35add2fd716..7143441f5476 100644
@@ -22,7 +22,6 @@ CONFIG_HZ_100=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_COMPACTION is not set
 CONFIG_NET=y
 CONFIG_PACKET=y

arch/mips/configs/ath79_defconfig +0 -1

index 4ffc59cab436..3d14d67dc746 100644
@@ -23,7 +23,6 @@ CONFIG_PCI=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y

arch/mips/configs/bcm63xx_defconfig +0 -2

index 54e2f9a659fb..861f680184b9 100644
@@ -21,8 +21,6 @@ CONFIG_PCI=y
 CONFIG_PCCARD=y
 CONFIG_PCMCIA_BCM63XX=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_UNIX=y
 CONFIG_INET=y

arch/mips/configs/bmips_be_defconfig +0 -2

index f669a40e085b..032bb51defe8 100644
@@ -12,8 +12,6 @@ CONFIG_NR_CPUS=4
 # CONFIG_SECCOMP is not set
 CONFIG_MIPS_O32_FP64_SUPPORT=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=y

arch/mips/configs/bmips_stb_defconfig +0 -2

index a0b775893dba..625bd2d7e685 100644
@@ -21,8 +21,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_BMIPS_CPUFREQ=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=y

arch/mips/configs/db1xxx_defconfig +0 -1

index bc9b6ae046b2..e6f3e8e3da39 100644
@@ -28,7 +28,6 @@ CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_PARTITION_ADVANCED=y
-CONFIG_DEFAULT_NOOP=y
 CONFIG_CMA=y
 CONFIG_CMA_DEBUG=y
 CONFIG_NET=y

arch/mips/configs/generic/board-ni169445.config +0 -1

index 1ed0d3e8715e..fc3580e4e6bc 100644
@@ -19,7 +19,6 @@ CONFIG_MTD_NAND_ECC_SW_HAMMING=y
 CONFIG_MTD_NAND_ECC_SW_BCH=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_GPIO=y
-CONFIG_MTD_NAND_IDS=y
 
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BLOCK=y

arch/mips/configs/lasat_defconfig +0 -2

index c66ca3785655..00cf461db971 100644
@@ -16,8 +16,6 @@ CONFIG_HZ_1000=y
 # CONFIG_SECCOMP is not set
 CONFIG_PCI=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y

arch/mips/configs/lemote2f_defconfig +1 -1

index f9f93427c9bd..8254d7d1396f 100644
@@ -26,7 +26,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_IOSCHED_DEADLINE=m
+CONFIG_MQ_IOSCHED_DEADLINE=m
 CONFIG_BINFMT_MISC=m
 CONFIG_NET=y
 CONFIG_PACKET=y

arch/mips/configs/loongson3_defconfig +3 -2

index 360c6b2d397a..51675f5000d6 100644
@@ -38,8 +38,9 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_PARTITION_ADVANCED=y
-CONFIG_IOSCHED_DEADLINE=m
-CONFIG_CFQ_GROUP_IOSCHED=y
+CONFIG_MQ_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 CONFIG_BINFMT_MISC=m
 CONFIG_KSM=y
 CONFIG_NET=y

arch/mips/configs/msp71xx_defconfig +0 -2

index 0fdc03fda12e..6ad1a2381226 100644
@@ -14,8 +14,6 @@ CONFIG_PCI=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_UNIX=y
 CONFIG_XFRM_USER=y

arch/mips/configs/pnx8335_stb225_defconfig +0 -2

index 738ba3b1374b..d06db6b87959 100644
@@ -14,8 +14,6 @@ CONFIG_HZ_128=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y

arch/mips/configs/rb532_defconfig +0 -1

index 5b947183852b..252d472387aa 100644
@@ -23,7 +23,6 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y

arch/mips/configs/rt305x_defconfig +0 -1

index 110948bc6b39..8c2ead53007a 100644
@@ -21,7 +21,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_COREDUMP is not set
 # CONFIG_COMPACTION is not set
 CONFIG_NET=y

arch/mips/configs/xway_defconfig +0 -1

index 49b5ea6eff62..9abbc0debc2a 100644
@@ -23,7 +23,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_COREDUMP is not set
 # CONFIG_COMPACTION is not set
 CONFIG_NET=y

Signature · 1 line

2.17.1

Paul Burton

Applied

2020-02-19 19:06 UTC #1 lore raw

Hello,

Quoted 7 lines · Krzysztof Kozlowski

CONFIG_MTD_NAND_IDS is gone and not needed (part of CONFIG_MTD_NAND) since commit f16bd7ca0457 ("mtd: nand: Kill the MTD_NAND_IDS Kconfig option").
CONFIG_IOSCHED_DEADLINE, CONFIG_IOSCHED_CFQ and CONFIG_DEFAULT_NOOP are gone since commit f382fb0bcef4 ("block: remove legacy IO schedulers").

Quoted 6 lines

The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be now enabled by default (along with MQ_IOSCHED_KYBER).
The BFQ_GROUP_IOSCHED is the only multiqueue scheduler which comes with group scheduling so select it in configs previously choosing CFQ_GROUP_IOSCHED.

Applied to mips-next.

Quoted 6 lines

commit f6541f347bba
https://git.kernel.org/mips/c/f6541f347bba
Signed-off-by Krzysztof Kozlowski <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Signed-off-by Paul Burton <[email protected]>

Thanks,
Paul

[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]