mmc: core: Cleanup code for setting ocr mask for SDIO

At several places in mmc_sdio_init_card function the cached mask in
host->ocr were being updated. To simplify code, we make use of an
local ocr parameter instead.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 0640de9333fa0e6bf3508e18ae1832816c13a561..35d179c8be76505fd93a578e3908627b66356ec6 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -598,23 +598,27 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
        struct mmc_card *card;
        int err;
        int retries = 10;
+       u32 rocr = 0;
 
        BUG_ON(!host);
        WARN_ON(!host->claimed);
 
+       /* to query card if 1.8V signalling is supported */
+       if (mmc_host_uhs(host))
+               ocr |= R4_18V_PRESENT;
+
 try_again:
        if (!retries) {
                pr_warning("%s: Skipping voltage switch\n",
                                mmc_hostname(host));
                ocr &= ~R4_18V_PRESENT;
-               host->ocr &= ~R4_18V_PRESENT;
        }
 
        /*
         * Inform the card of the voltage
         */
        if (!powered_resume) {
-               err = mmc_send_io_op_cond(host, host->ocr, &ocr);
+               err = mmc_send_io_op_cond(host, ocr, &rocr);
                if (err)
                        goto err;
        }
@@ -637,8 +641,8 @@ try_again:
                goto err;
        }
 
-       if ((ocr & R4_MEMORY_PRESENT) &&
-           mmc_sd_get_cid(host, host->ocr & ocr, card->raw_cid, NULL) == 0) {
+       if ((rocr & R4_MEMORY_PRESENT) &&
+           mmc_sd_get_cid(host, ocr & rocr, card->raw_cid, NULL) == 0) {
                card->type = MMC_TYPE_SD_COMBO;
 
                if (oldcard && (oldcard->type != MMC_TYPE_SD_COMBO ||
@@ -668,9 +672,9 @@ try_again:
         * systems that claim 1.8v signalling in fact do not support
         * it.
         */
-       if (!powered_resume && (ocr & R4_18V_PRESENT) && mmc_host_uhs(host)) {
+       if (!powered_resume && (rocr & ocr & R4_18V_PRESENT)) {
                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180,
-                                       host->ocr);
+                                       ocr);
                if (err == -EAGAIN) {
                        sdio_reset(host);
                        mmc_go_idle(host);
@@ -680,12 +684,10 @@ try_again:
                        goto try_again;
                } else if (err) {
                        ocr &= ~R4_18V_PRESENT;
-                       host->ocr &= ~R4_18V_PRESENT;
                }
                err = 0;
        } else {
                ocr &= ~R4_18V_PRESENT;
-               host->ocr &= ~R4_18V_PRESENT;
        }
 
        /*
@@ -1105,10 +1107,6 @@ static int mmc_sdio_power_restore(struct mmc_host *host)
                goto out;
        }
 
-       if (mmc_host_uhs(host))
-               /* to query card if 1.8V signalling is supported */
-               host->ocr |= R4_18V_PRESENT;
-
        ret = mmc_sdio_init_card(host, host->ocr, host->card,
                                mmc_card_keep_power(host));
        if (!ret && host->sdio_irqs)
@@ -1191,10 +1189,6 @@ int mmc_attach_sdio(struct mmc_host *host)
        /*
         * Detect and init the card.
         */
-       if (mmc_host_uhs(host))
-               /* to query card if 1.8V signalling is supported */
-               host->ocr |= R4_18V_PRESENT;
-
        err = mmc_sdio_init_card(host, host->ocr, NULL, 0);
        if (err)
                goto err;