Revert "mmc: sd: When resuming, try a little harder to init the card"

This reverts commit c7e87866b25cb49a830c85b0206436a7b0e3e40b.

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 53f15b7f1ece2508b391635152ae83cf3bed7f8a..2d089e672c6bd27061398088d34fb5f31c6c9f06 100755 (executable)
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -607,31 +607,12 @@ static int mmc_sd_suspend(struct mmc_host *host)
 static int mmc_sd_resume(struct mmc_host *host)
 {
        int err;
-#ifdef CONFIG_MMC_PARANOID_SD_INIT
-       int retries;
-#endif
 
        BUG_ON(!host);
        BUG_ON(!host->card);
 
        mmc_claim_host(host);
-#ifdef CONFIG_MMC_PARANOID_SD_INIT
-       retries = 5;
-       while (retries) {
-               err = mmc_sd_init_card(host, host->ocr, host->card);
-
-               if (err) {
-                       printk(KERN_ERR "%s: Re-init card rc = %d (retries = %d)\n",
-                              mmc_hostname(host), err, retries);
-                       mdelay(5);
-                       retries--;
-                       continue;
-               }
-               break;
-       }
-#else
        err = mmc_sd_init_card(host, host->ocr, host->card);
-#endif
        mmc_release_host(host);
 
        return err;