temp revert rk change

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / core / sdio.c

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index da17bddc15fc6d08dea0e8060663dd74adbf9b15..d3ec4dc18d14fd7eca04cba98f1a0c4c12feca25 100755 (executable)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -346,13 +346,8 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
         */
        if (!powered_resume) {
                err = mmc_send_io_op_cond(host, host->ocr, &ocr);
-               if (err) {
-#if defined(CONFIG_SDMMC_RK29) && !defined(CONFIG_SDMMC_RK29_OLD)      
-           printk("%s..%d..  ====*Identify the card as SDIO , but OCR error, so fail to initialize.===xbw[%s]===\n", \
-               __FUNCTION__, __LINE__, mmc_hostname(host));
-#endif         
+               if (err)
                        goto err;
-               }
        }
 
        /*
@@ -405,16 +400,6 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
                if (err)
                        goto remove;
 
-#if defined(CONFIG_SDMMC_RK29) && defined(CONFIG_SDMMC_RK29_OLD)  //old driver add the code ,reform to kernel2.6.38  
-               /*
-                * Update oldcard with the new RCA received from the SDIO
-                * device -- we're doing this so that it's updated in the
-                * "card" struct when oldcard overwrites that later.
-                */
-               if (oldcard)
-                       oldcard->rca = card->rca;
-#endif
-
                mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
        }
 
@@ -822,10 +807,6 @@ int sdio_reset_comm(struct mmc_card *card)
 
        printk("%s():\n", __func__);
        mmc_claim_host(host);
-       
-#if defined(CONFIG_SDMMC_RK29) && !defined(CONFIG_SDMMC_RK29_OLD)
-       host->sdmmc_host_hw_init(mmc_priv(host));  //added by xbw , at 2011-10-18
-#endif
 
        mmc_go_idle(host);