aboutsummaryrefslogtreecommitdiff
path: root/drivers/mmc/host/cavium.c
diff options
context:
space:
mode:
authorGravatar Ulf Hansson <ulf.hansson@linaro.org> 2020-05-08 13:29:02 +0200
committerGravatar Ulf Hansson <ulf.hansson@linaro.org> 2020-05-28 11:22:14 +0200
commit1be64c7963f89afbd6f96f27effea20900650dfe (patch)
tree9e3454ba21fdcb7a979c51c0d6ab36949cd9482f /drivers/mmc/host/cavium.c
parentmmc: core: Enable erase/discard/trim support for all mmc hosts (diff)
downloadlinux-1be64c7963f89afbd6f96f27effea20900650dfe.tar.gz
linux-1be64c7963f89afbd6f96f27effea20900650dfe.tar.bz2
linux-1be64c7963f89afbd6f96f27effea20900650dfe.zip
mmc: host: Drop redundant MMC_CAP_ERASE
The MMC_CAP_ERASE bit is no longer used by the mmc core as erase, discard and trim operations are now always supported. Therefore, drop the bit and move all mmc hosts away from using it. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com> Link: https://lore.kernel.org/r/20200508112902.23575-1-ulf.hansson@linaro.org Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/mmc/host/cavium.c')
-rw-r--r--drivers/mmc/host/cavium.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/cavium.c b/drivers/mmc/host/cavium.c
index 89deb451e0ac..c5da3aaee334 100644
--- a/drivers/mmc/host/cavium.c
+++ b/drivers/mmc/host/cavium.c
@@ -1038,8 +1038,7 @@ int cvm_mmc_of_slot_probe(struct device *dev, struct cvm_mmc_host *host)
* Disable bounce buffers for max_segs = 1
*/
mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
- MMC_CAP_ERASE | MMC_CAP_CMD23 | MMC_CAP_POWER_OFF_CARD |
- MMC_CAP_3_3V_DDR;
+ MMC_CAP_CMD23 | MMC_CAP_POWER_OFF_CARD | MMC_CAP_3_3V_DDR;
if (host->use_sg)
mmc->max_segs = 16;