mmc: core: Let mmc_set_signal_voltage take ocr as parameter

This is yet another step of restructure code to be able to fixup the
setup of the negotiated ocr mask.

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

4 files changed, 7 insertions, 5 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index b66e7ab2ad43..5909ba46b8f2 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1397,7 +1397,7 @@ int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage)
 
 }
 
-int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage)
+int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, u32 ocr)
 {
         struct mmc_command cmd = {0};
         int err = 0;
@@ -1479,7 +1479,7 @@ power_cycle:
         if (err) {
                 pr_debug("%s: Signal voltage switch failed, "
                         "power cycling card\n", mmc_hostname(host));
-                mmc_power_cycle(host, host->ocr);
+                mmc_power_cycle(host, ocr);
         }
 
         mmc_host_clk_release(host);
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 502769a71821..443a584660f0 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -42,7 +42,7 @@ void mmc_set_ungated(struct mmc_host *host);
 void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode);
 void mmc_set_bus_width(struct mmc_host *host, unsigned int width);
 u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);
-int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage);
+int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, u32 ocr);
 int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage);
 void mmc_set_timing(struct mmc_host *host, unsigned int timing);
 void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index af55e9e0819c..5818887fffb3 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -773,7 +773,8 @@ try_again:
          */
         if (!mmc_host_is_spi(host) && rocr &&
            ((*rocr & 0x41000000) == 0x41000000)) {
-                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);
+                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180,
+                                        host->ocr);
                 if (err == -EAGAIN) {
                         retries--;
                         goto try_again;
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 355c95270d48..15cbc418c95f 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -664,7 +664,8 @@ try_again:
          * it.
          */
         if (!powered_resume && (ocr & R4_18V_PRESENT) && mmc_host_uhs(host)) {
-                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);
+                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180,
+                                        host->ocr);
                 if (err == -EAGAIN) {
                         sdio_reset(host);
                         mmc_go_idle(host);