redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Adrian Hunter 2017-11-29 15:41:17 +02:00 committed by Ulf Hansson
parent f2bc600008
commit 1bec43a3b1
5 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/mmc/Kconfig
View file

@ -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"

7
drivers/mmc/core/core.c
View file

@ -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)
{

2
drivers/mmc/core/core.h
View file

@ -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);

2
drivers/mmc/core/host.c
View file

@ -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;
}

2
drivers/mmc/core/host.h
View file

@ -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