public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc <linux-mmc@vger.kernel.org>
Subject: [PATCH V2 8/9] mmc: sdhci: Simplify tuning block size logic
Date: Fri,  2 Dec 2016 15:14:26 +0200	[thread overview]
Message-ID: <1480684467-26833-9-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1480684467-26833-1-git-send-email-adrian.hunter@intel.com>

There are only 2 possible block sizes, so simplify 2 if-statements into 1.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 drivers/mmc/host/sdhci.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index fa89870a690b..e9ff7d005851 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2024,17 +2024,11 @@ static void sdhci_send_tuning(struct sdhci_host *host, u32 opcode,
 	 * block to the Host Controller. So we set the block size
 	 * to 64 here.
 	 */
-	if (cmd.opcode == MMC_SEND_TUNING_BLOCK_HS200) {
-		if (mmc->ios.bus_width == MMC_BUS_WIDTH_8)
-			sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 128),
-				     SDHCI_BLOCK_SIZE);
-		else if (mmc->ios.bus_width == MMC_BUS_WIDTH_4)
-			sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64),
-				     SDHCI_BLOCK_SIZE);
-	} else {
-		sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64),
-			     SDHCI_BLOCK_SIZE);
-	}
+	if (cmd.opcode == MMC_SEND_TUNING_BLOCK_HS200 &&
+	    mmc->ios.bus_width == MMC_BUS_WIDTH_8)
+		sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 128), SDHCI_BLOCK_SIZE);
+	else
+		sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64), SDHCI_BLOCK_SIZE);
 
 	/*
 	 * The tuning block is sent by the card to the host controller.
-- 
1.9.1


  parent reply	other threads:[~2016-12-02 13:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-02 13:14 [PATCH V2 0/9] mmc: sdhci: Fix recovery from tuning timeout Adrian Hunter
2016-12-02 13:14 ` [PATCH V2 1/9] Revert "mmc: sdhci: Reset cmd and data circuits after tuning failure" Adrian Hunter
2016-12-02 13:14 ` [PATCH V2 2/9] mmc: sdhci: Fix recovery from tuning timeout Adrian Hunter
2016-12-02 13:14 ` [PATCH V2 3/9] mmc: sdhci: Fix tuning reset after exhausting the maximum number of loops Adrian Hunter
2016-12-02 13:14 ` [PATCH V2 4/9] mmc: sdhci: Always allow tuning to fall back to fixed sampling Adrian Hunter
2016-12-02 13:14 ` [PATCH V2 5/9] mmc: mmc: Introduce mmc_abort_tuning() Adrian Hunter
2016-12-02 13:14 ` [PATCH V2 6/9] mmc: sdhci: Use mmc_abort_tuning() Adrian Hunter
2016-12-02 13:14 ` [PATCH V2 7/9] mmc: sdhci: Factor out tuning helper functions Adrian Hunter
2016-12-02 13:59   ` [PATCH V3 " Adrian Hunter
2016-12-02 13:14 ` Adrian Hunter [this message]
2016-12-02 13:14 ` [PATCH V2 9/9] mmc: sdhci: Tidy tuning loop Adrian Hunter
2016-12-05 13:19 ` [PATCH V2 0/9] mmc: sdhci: Fix recovery from tuning timeout Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480684467-26833-9-git-send-email-adrian.hunter@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=linux-mmc@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox