aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2016-12-02 08:14:24 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2016-12-05 08:16:23 -0500
commitd0c3ab59105dd0192fc9bc3a578584a5b1c01dd0 (patch)
treec44f4522917ad7335eff3cc4d55f726b461d64f6
parente711f0309109701cb422aab44ace4ea0dccb89ea (diff)
mmc: sdhci: Use mmc_abort_tuning()
Use mmc_abort_tuning() instead of open-coding the stop command. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/sdhci.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a23887799f43..b841d0a57af1 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2098,20 +2098,11 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
2098 sdhci_do_reset(host, SDHCI_RESET_CMD); 2098 sdhci_do_reset(host, SDHCI_RESET_CMD);
2099 sdhci_do_reset(host, SDHCI_RESET_DATA); 2099 sdhci_do_reset(host, SDHCI_RESET_DATA);
2100 2100
2101 if (cmd.opcode != MMC_SEND_TUNING_BLOCK_HS200)
2102 goto out;
2103
2104 sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); 2101 sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
2105 sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); 2102 sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
2106 2103
2107 spin_unlock_irqrestore(&host->lock, flags); 2104 spin_unlock_irqrestore(&host->lock, flags);
2108 2105 mmc_abort_tuning(mmc, opcode);
2109 memset(&cmd, 0, sizeof(cmd));
2110 cmd.opcode = MMC_STOP_TRANSMISSION;
2111 cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
2112 cmd.busy_timeout = 50;
2113 mmc_wait_for_cmd(mmc, &cmd, 0);
2114
2115 spin_lock_irqsave(&host->lock, flags); 2106 spin_lock_irqsave(&host->lock, flags);
2116 2107
2117 goto out; 2108 goto out;