From: Adrian Hunter <adrian.hunter@intel.com>
Date: Wed, 29 Nov 2017 15:41:17 +0200
Subject: mmc: core: Remove option not to use blk-mq
Git-commit: 1bec43a3b181baebdf8a4cd739b480a9132601d7
Patch-mainline: v4.16-rc1
References: FATE#324519
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>
Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.com>
---
drivers/mmc/Kconfig | 10 ----------
drivers/mmc/core/core.c | 7 -------
drivers/mmc/core/core.h | 2 --
drivers/mmc/core/host.c | 2 --
drivers/mmc/core/host.h | 2 +-
5 files changed, 1 insertion(+), 22 deletions(-)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -19,16 +19,6 @@ config MMC_DEBUG
This is an option for use by developers; most people should
say N here. This enables MMC core and driver debugging.
-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"
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -66,13 +66,6 @@ static const unsigned freqs[] = { 400000
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)
{
--- 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);
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -391,8 +391,6 @@ struct mmc_host *mmc_alloc_host(int extr
host->max_blk_size = 512;
host->max_blk_count = PAGE_SIZE / 512;
- host->use_blk_mq = mmc_use_blk_mq;
-
return host;
}
--- a/drivers/mmc/core/host.h
+++ b/drivers/mmc/core/host.h
@@ -81,7 +81,7 @@ static inline bool mmc_card_hs400es(stru
static inline bool mmc_host_use_blk_mq(struct mmc_host *host)
{
- return host->use_blk_mq;
+ return true;
}
#endif