From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Hunter Subject: [PATCH V2 6/9] mmc: sdhci: Use mmc_abort_tuning() Date: Fri, 2 Dec 2016 15:14:24 +0200 Message-ID: <1480684467-26833-7-git-send-email-adrian.hunter@intel.com> References: <1480684467-26833-1-git-send-email-adrian.hunter@intel.com> Return-path: Received: from mga03.intel.com ([134.134.136.65]:19835 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752569AbcLBNTq (ORCPT ); Fri, 2 Dec 2016 08:19:46 -0500 In-Reply-To: <1480684467-26833-1-git-send-email-adrian.hunter@intel.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Ulf Hansson Cc: linux-mmc Use mmc_abort_tuning() instead of open-coding the stop command. Signed-off-by: Adrian Hunter --- drivers/mmc/host/sdhci.c | 11 +---------- 1 file changed, 1 insertion(+), 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; -- 1.9.1