Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: core: Remove option not to use blk-mq

Remove config option MMC_MQ_DEFAULT and parameter mmc_use_blk_mq, so that
blk-mq must be used always.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Adrian Hunter and committed by
Ulf Hansson
1bec43a3 f2bc6000

+1 -22
-10
drivers/mmc/Kconfig
··· 12 12 If you want MMC/SD/SDIO support, you should say Y here and 13 13 also to your specific host controller driver. 14 14 15 - config MMC_MQ_DEFAULT 16 - bool "MMC: use blk-mq I/O path by default" 17 - depends on MMC && BLOCK 18 - default y 19 - ---help--- 20 - This option enables the new blk-mq based I/O path for MMC block 21 - devices by default. With the option the mmc_core.use_blk_mq 22 - module/boot option defaults to Y, without it to N, but it can 23 - still be overridden either way. 24 - 25 15 if MMC 26 16 27 17 source "drivers/mmc/core/Kconfig"
-7
drivers/mmc/core/core.c
··· 66 66 bool use_spi_crc = 1; 67 67 module_param(use_spi_crc, bool, 0); 68 68 69 - #ifdef CONFIG_MMC_MQ_DEFAULT 70 - bool mmc_use_blk_mq = true; 71 - #else 72 - bool mmc_use_blk_mq = false; 73 - #endif 74 - module_param_named(use_blk_mq, mmc_use_blk_mq, bool, S_IWUSR | S_IRUGO); 75 - 76 69 static int mmc_schedule_delayed_work(struct delayed_work *work, 77 70 unsigned long delay) 78 71 {
-2
drivers/mmc/core/core.h
··· 35 35 int (*reset)(struct mmc_host *); 36 36 }; 37 37 38 - extern bool mmc_use_blk_mq; 39 - 40 38 void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops); 41 39 void mmc_detach_bus(struct mmc_host *host); 42 40
-2
drivers/mmc/core/host.c
··· 404 404 405 405 host->fixed_drv_type = -EINVAL; 406 406 407 - host->use_blk_mq = mmc_use_blk_mq; 408 - 409 407 return host; 410 408 } 411 409
+1 -1
drivers/mmc/core/host.h
··· 81 81 82 82 static inline bool mmc_host_use_blk_mq(struct mmc_host *host) 83 83 { 84 - return host->use_blk_mq; 84 + return true; 85 85 } 86 86 87 87 #endif