Commit b6891679 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

mmc: core: Re-use code for MMC_CAP2_DETECT_ON_ERR in polling mode 



Previously the MMC_CAP2_DETECT_ON_ERR was invented for detecting
slow card removal. In was never a realy good solution and a proper
fix has been merged using gpio debouncing instead. We remove this
cap in this patch.

Although when using polling card detect mode, the code invented for
MMC_CAP2_DETECT_ON_ERR is re-used to complete card removal in an
earlier phase. There are no need waiting for the polling timeout to
elapse in this case.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarKevin Liu <kliu5@marvell.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 810e08ee

drivers/mmc/core/core.c

+2 −3
Original line number Diff line number Diff line
@@ -2325,14 +2325,13 @@ int mmc_detect_card_removed(struct mmc_host *host) 
	 * The card will be considered unchanged unless we have been asked to

	 * detect a change or host requires polling to provide card detection.

	 */

	if (!host->detect_change && !(host->caps & MMC_CAP_NEEDS_POLL) &&

	    !(host->caps2 & MMC_CAP2_DETECT_ON_ERR))

	if (!host->detect_change && !(host->caps & MMC_CAP_NEEDS_POLL))

		return ret;



	host->detect_change = 0;

	if (!ret) {

		ret = _mmc_detect_card_removed(host);

		if (ret && (host->caps2 & MMC_CAP2_DETECT_ON_ERR)) {

		if (ret && (host->caps & MMC_CAP_NEEDS_POLL)) {

			/*

			 * Schedule a detect work as soon as possible to let a

			 * rescan handle the card removal.

include/linux/mmc/host.h

+0 −1
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ struct mmc_host { 
#define MMC_CAP2_HS200		(MMC_CAP2_HS200_1_8V_SDR | \

				 MMC_CAP2_HS200_1_2V_SDR)

#define MMC_CAP2_BROKEN_VOLTAGE	(1 << 7)	/* Use the broken voltage */

#define MMC_CAP2_DETECT_ON_ERR	(1 << 8)	/* On I/O err check card removal */

#define MMC_CAP2_HC_ERASE_SZ	(1 << 9)	/* High-capacity erase size */

#define MMC_CAP2_CD_ACTIVE_HIGH	(1 << 10)	/* Card-detect signal active high */

#define MMC_CAP2_RO_ACTIVE_HIGH	(1 << 11)	/* Write-protect signal active high */

CRA Git | Maintained and supported by SUSTech CRA and CCSE