Commit 94fe2580 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20200508112853.23525-1-ulf.hansson@linaro.org


Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 04f2f45f

drivers/mmc/core/core.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}