mmc: core: Simplify by adding mmc_execute_tuning()

For each MMC, SD and SDIO there is code that
holds the clock, calls ops->execute_tuning, and
releases the clock. Simplify the code a bit by
providing a separate function to do that.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 4 insertions, 9 deletions

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 36d5333838cb..ad4d43eae99d 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -660,15 +660,10 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card)
          * SPI mode doesn't define CMD19 and tuning is only valid for SDR50 and
          * SDR104 mode SD-cards. Note that tuning is mandatory for SDR104.
          */
-        if (!mmc_host_is_spi(card->host) && card->host->ops->execute_tuning &&
-                        (card->sd_bus_speed == UHS_SDR50_BUS_SPEED ||
-                         card->sd_bus_speed == UHS_SDR104_BUS_SPEED)) {
-                mmc_host_clk_hold(card->host);
-                err = card->host->ops->execute_tuning(card->host,
-                                                      MMC_SEND_TUNING_BLOCK);
-                mmc_host_clk_release(card->host);
-        }
-
+        if (!mmc_host_is_spi(card->host) &&
+            (card->sd_bus_speed == UHS_SDR50_BUS_SPEED ||
+             card->sd_bus_speed == UHS_SDR104_BUS_SPEED))
+                err = mmc_execute_tuning(card);
 out:
         kfree(status);