Commit 1be64c79 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Link: https://lore.kernel.org/r/20200508112902.23575-1-ulf.hansson@linaro.org


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

drivers/mmc/host/bcm2835.c

+1 −2
Original line number Diff line number Diff line
@@ -1280,8 +1280,7 @@ static int bcm2835_add_host(struct bcm2835_host *host) 


	/* host controller capabilities */

	mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED |

		     MMC_CAP_NEEDS_POLL | MMC_CAP_HW_RESET | MMC_CAP_ERASE |

		     MMC_CAP_CMD23;

		     MMC_CAP_NEEDS_POLL | MMC_CAP_HW_RESET | MMC_CAP_CMD23;



	spin_lock_init(&host->lock);

	mutex_init(&host->mutex);

drivers/mmc/host/cavium.c

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

drivers/mmc/host/dw_mmc.c

+0 −6
Original line number Diff line number Diff line
@@ -2751,12 +2751,6 @@ static int dw_mci_init_slot_caps(struct dw_mci_slot *slot) 
	if (host->pdata->caps)

		mmc->caps = host->pdata->caps;



	/*

	 * Support MMC_CAP_ERASE by default.

	 * It needs to use trim/discard/erase commands.

	 */

	mmc->caps |= MMC_CAP_ERASE;



	if (host->pdata->pm_caps)

		mmc->pm_caps = host->pdata->pm_caps;

drivers/mmc/host/meson-mx-sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int meson_mx_mmc_add_host(struct meson_mx_mmc_host *host) 
	mmc->f_max = clk_round_rate(host->cfg_div_clk,

				    clk_get_rate(host->parent_clk));



	mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY;

	mmc->caps |= MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY;

	mmc->ops = &meson_mx_mmc_ops;



	ret = mmc_of_parse(mmc);

drivers/mmc/host/mtk-sd.c

+1 −1
Original line number Diff line number Diff line
@@ -2326,7 +2326,7 @@ static int msdc_drv_probe(struct platform_device *pdev) 
	if (mmc->caps & MMC_CAP_SDIO_IRQ)

		mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;



	mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23;

	mmc->caps |= MMC_CAP_CMD23;

	/* MMC core transfer sizes tunable parameters */

	mmc->max_segs = MAX_BD_NUM;

	if (host->dev_comp->support_64g)

CRA Git | Maintained and supported by SUSTech CRA and CCSE