diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2016-12-02 14:14:24 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-12-05 14:16:23 +0100 |
| commit | d0c3ab59105dd0192fc9bc3a578584a5b1c01dd0 (patch) | |
| tree | c44f4522917ad7335eff3cc4d55f726b461d64f6 /drivers/mmc | |
| parent | mmc: mmc: Introduce mmc_abort_tuning() (diff) | |
| download | linux-d0c3ab59105dd0192fc9bc3a578584a5b1c01dd0.tar.xz linux-d0c3ab59105dd0192fc9bc3a578584a5b1c01dd0.zip | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 11 |
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) sdhci_do_reset(host, SDHCI_RESET_CMD); sdhci_do_reset(host, SDHCI_RESET_DATA); - if (cmd.opcode != MMC_SEND_TUNING_BLOCK_HS200) - goto out; - sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); spin_unlock_irqrestore(&host->lock, flags); - - memset(&cmd, 0, sizeof(cmd)); - cmd.opcode = MMC_STOP_TRANSMISSION; - cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC; - cmd.busy_timeout = 50; - mmc_wait_for_cmd(mmc, &cmd, 0); - + mmc_abort_tuning(mmc, opcode); spin_lock_irqsave(&host->lock, flags); goto out; |