lkml.org 
[lkml]   [2017]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V14 22/24] mmc: core: Remove option not to use blk-mq
    Date
    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>
    ---
    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(-)

    diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
    index 42565562577c..ec21388311db 100644
    --- 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 617802f45386..7ca6e4866a8b 100644
    --- a/drivers/mmc/core/core.c
    +++ b/drivers/mmc/core/core.c
    @@ -66,13 +66,6 @@
    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 aa87cd8d14c6..f564ddfbe070 100644
    --- 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 62ef6cb0ece4..35a9e4fd1a9f 100644
    --- 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 6eaf558e62d6..a33903a2ea96 100644
    --- a/drivers/mmc/core/host.h
    +++ b/drivers/mmc/core/host.h
    @@ -76,7 +76,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
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-11-21 14:46    [W:4.158 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site