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>

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 42565562577cc3e3fe46d4c93bddf7c688e599d7..ec21388311db258e730f328a957712fa72630a09 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -12,16 +12,6 @@ menuconfig MMC
          If you want MMC/SD/SDIO support, you should say Y here and
          also to your specific host controller driver.
 
-config MMC_MQ_DEFAULT
-       bool "MMC: use blk-mq I/O path by default"
-       depends on MMC && BLOCK
-       default y
-       ---help---
-         This option enables the new blk-mq based I/O path for MMC block
-         devices by default.  With the option the mmc_core.use_blk_mq
-         module/boot option defaults to Y, without it to N, but it can
-         still be overridden either way.
-
 if MMC
 
 source "drivers/mmc/core/Kconfig"

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 455abbf4f41eeac006a4a9d938c521ac20550b50..2a137976107f32c9d3c74678fed032c794fb1a92 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -66,13 +66,6 @@ static const unsigned freqs[] = { 400000, 300000, 200000, 100000 };
 bool use_spi_crc = 1;
 module_param(use_spi_crc, bool, 0);
 
-#ifdef CONFIG_MMC_MQ_DEFAULT
-bool mmc_use_blk_mq = true;
-#else
-bool mmc_use_blk_mq = false;
-#endif
-module_param_named(use_blk_mq, mmc_use_blk_mq, bool, S_IWUSR | S_IRUGO);
-
 static int mmc_schedule_delayed_work(struct delayed_work *work,
                                     unsigned long delay)
 {

diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 136617d2f971acb4b2fdd96c1172ef61db67e072..3e3d21304e5f6512e8cc154f78c09e429ba5de47 100644 (file)
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -35,8 +35,6 @@ struct mmc_bus_ops {
        int (*reset)(struct mmc_host *);
 };
 
-extern bool mmc_use_blk_mq;
-
 void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);
 void mmc_detach_bus(struct mmc_host *host);
 

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 409a68a96a0aefa289c25d4a9cddc63404ed1406..64b03d6eaf184a30c133440299f5820943c8b2bf 100644 (file)
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -404,8 +404,6 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
 
        host->fixed_drv_type = -EINVAL;
 
-       host->use_blk_mq = mmc_use_blk_mq;
-
        return host;
 }
 

diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h
index 8ca284e079e3e921d9274b3e058d8dfe6ec9715e..6d896869e5c6a1b8531d55bdcb0658926fe5b341 100644 (file)
--- a/drivers/mmc/core/host.h
+++ b/drivers/mmc/core/host.h
@@ -81,7 +81,7 @@ static inline bool mmc_card_hs400es(struct mmc_card *card)
 
 static inline bool mmc_host_use_blk_mq(struct mmc_host *host)
 {
-       return host->use_blk_mq;
+       return true;
 }
 
 #endif