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>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 2cdb06e0643e5bd7829334f4bf57bdabd37dc292..dc9eb013db5fecdcd40ead09fcb2d008f08a3890 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1077,6 +1077,30 @@ void mmc_set_ungated(struct mmc_host *host)
 }
 #endif
 
+int mmc_execute_tuning(struct mmc_card *card)
+{
+       struct mmc_host *host = card->host;
+       u32 opcode;
+       int err;
+
+       if (!host->ops->execute_tuning)
+               return 0;
+
+       if (mmc_card_mmc(card))
+               opcode = MMC_SEND_TUNING_BLOCK_HS200;
+       else
+               opcode = MMC_SEND_TUNING_BLOCK;
+
+       mmc_host_clk_hold(host);
+       err = host->ops->execute_tuning(host, opcode);
+       mmc_host_clk_release(host);
+
+       if (err)
+               pr_err("%s: tuning execution failed\n", mmc_hostname(host));
+
+       return err;
+}
+
 /*
  * Change the bus mode (open drain/push-pull) of a host.
  */

diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index a0bccbc4c5ea16c4f44bb63940a9488c2eeca372..cfba3c05aab1ca8ec536ba3f87020a1a0b93437c 100644 (file)
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -86,5 +86,8 @@ void mmc_add_card_debugfs(struct mmc_card *card);
 void mmc_remove_card_debugfs(struct mmc_card *card);
 
 void mmc_init_context_info(struct mmc_host *host);
+
+int mmc_execute_tuning(struct mmc_card *card);
+
 #endif
 

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index d5d576a4bcbb69f1a8073c03c24315f7876d2882..1fc48a2806597ae6f76c30801304a0b29cd1d1e7 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1162,7 +1162,6 @@ bus_speed:
 static int mmc_hs200_tuning(struct mmc_card *card)
 {
        struct mmc_host *host = card->host;
-       int err = 0;
 
        /*
         * Timing should be adjusted to the HS400 target
@@ -1173,18 +1172,7 @@ static int mmc_hs200_tuning(struct mmc_card *card)
                if (host->ops->prepare_hs400_tuning)
                        host->ops->prepare_hs400_tuning(host, &host->ios);
 
-       if (host->ops->execute_tuning) {
-               mmc_host_clk_hold(host);
-               err = host->ops->execute_tuning(host,
-                               MMC_SEND_TUNING_BLOCK_HS200);
-               mmc_host_clk_release(host);
-
-               if (err)
-                       pr_err("%s: tuning execution failed\n",
-                               mmc_hostname(host));
-       }
-
-       return err;
+       return mmc_execute_tuning(card);
 }
 
 /*

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 36d5333838cb42b7d371bd19e4a4959869dc8bf8..ad4d43eae99defd6b5a975cff9d074ff3929c245 100644 (file)
--- 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);
 

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index fd0750b5a6343a2f196d14078c2e998c9f80985f..ce6cc47206b0f3d6d91b4b69f35a66720cf14c47 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -567,17 +567,11 @@ static int mmc_sdio_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->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR50) ||
-                        (card->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR104))) {
-               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->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR50) ||
+            (card->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR104)))
+               err = mmc_execute_tuning(card);
 out:
-
        return err;
 }