mmc: core: Move calls to ->prepare_hs400_tuning() closer to mmc code

Move the calls to ->prepare_hs400_tuning(), from mmc_retune() into
mmc_hs400_to_hs200(), as it better belongs there, rather than being generic
to all type of cards.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index c57ffff18e37..abf9e884386c 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -143,9 +143,6 @@ int mmc_retune(struct mmc_host *host)
                         goto out;
 
                 return_to_hs400 = true;
-
-                if (host->ops->prepare_hs400_tuning)
-                        host->ops->prepare_hs400_tuning(host, &host->ios);
         }
 
         err = mmc_execute_tuning(host->card);
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 57a8bd39cdde..4466f5de54d4 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1282,6 +1282,10 @@ int mmc_hs400_to_hs200(struct mmc_card *card)
 
         mmc_set_bus_speed(card);
 
+        /* Prepare tuning for HS400 mode. */
+        if (host->ops->prepare_hs400_tuning)
+                host->ops->prepare_hs400_tuning(host, &host->ios);
+
         return 0;
 
 out_err: