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: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Liu <kliu5@marvell.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index c40396f23202..6e4d04df37e0 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -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.