mmc: core: Enable erase/discard/trim support for all mmc hosts

Step by step, mmc host drivers and the mmc core have been improved in
regards to support erase/discard/trim operations. We have now reached a
point when it no longer seems reasonable to use an opt-in approach to
enable the functionality. Therefore, let's switch to make the operations
always supported.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20200508112853.23525-1-ulf.hansson@linaro.org
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 4c5de6d37ac70e76ed2b329560ed667f7d4211eb..8d2b808e9b58612d85eece795111d6d66bd61db0 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1815,8 +1815,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,
        unsigned int rem, to = from + nr;
        int err;
 
-       if (!(card->host->caps & MMC_CAP_ERASE) ||
-           !(card->csd.cmdclass & CCC_ERASE))
+       if (!(card->csd.cmdclass & CCC_ERASE))
                return -EOPNOTSUPP;
 
        if (!card->erase_size)
@@ -1872,8 +1871,7 @@ EXPORT_SYMBOL(mmc_erase);
 
 int mmc_can_erase(struct mmc_card *card)
 {
-       if ((card->host->caps & MMC_CAP_ERASE) &&
-           (card->csd.cmdclass & CCC_ERASE) && card->erase_size)
+       if (card->csd.cmdclass & CCC_ERASE && card->erase_size)
                return 1;
        return 0;
 }