Revert "mmc: sd: Add retries in re-detection"

This reverts commit 5b23a96fd66d13f00315d5d46f2b399464707a90.

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 8fe5e9ece251634762e6dfba96523ed9494f55fe..53f15b7f1ece2508b391635152ae83cf3bed7f8a 100755 (executable)
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -558,36 +558,18 @@ static void mmc_sd_remove(struct mmc_host *host)
  */
 static void mmc_sd_detect(struct mmc_host *host)
 {
-       int err = 0;
-#ifdef CONFIG_MMC_PARANOID_SD_INIT
-        int retries = 5;
-#endif
+       int err;
 
        BUG_ON(!host);
        BUG_ON(!host->card);
-       
+
        mmc_claim_host(host);
 
        /*
         * Just check if our card has been removed.
         */
-#ifdef CONFIG_MMC_PARANOID_SD_INIT
-       while(retries) {
-               err = mmc_send_status(host->card, NULL);
-               if (err) {
-                       retries--;
-                       udelay(5);
-                       continue;
-               }
-               break;
-       }
-       if (!retries) {
-               printk(KERN_ERR "%s(%s): Unable to re-detect card (%d)\n",
-                      __func__, mmc_hostname(host), err);
-       }
-#else
        err = mmc_send_status(host->card, NULL);
-#endif
+
        mmc_release_host(host);
 
        if (err) {
@@ -715,9 +697,6 @@ static void mmc_sd_attach_bus_ops(struct mmc_host *host)
 int mmc_attach_sd(struct mmc_host *host, u32 ocr)
 {
        int err;
-#ifdef CONFIG_MMC_PARANOID_SD_INIT
-       int retries;
-#endif
 
        BUG_ON(!host);
        WARN_ON(!host->claimed);
@@ -766,27 +745,9 @@ int mmc_attach_sd(struct mmc_host *host, u32 ocr)
        /*
         * Detect and init the card.
         */
-#ifdef CONFIG_MMC_PARANOID_SD_INIT
-       retries = 5;
-       while (retries) {
-               err = mmc_sd_init_card(host, host->ocr, NULL);
-               if (err) {
-                       retries--;
-                       continue;
-               }
-               break;
-       }
-
-       if (!retries) {
-               printk(KERN_ERR "%s: mmc_sd_init_card() failure (err = %d)\n",
-                      mmc_hostname(host), err);
-               goto err;
-       }
-#else
        err = mmc_sd_init_card(host, host->ocr, NULL);
        if (err)
                goto err;
-#endif
 
        mmc_release_host(host);