diff mbox series

[4.4.y-cip,29/31] mmc: tmio: always get number of taps

Message ID	1574170570-15179-30-git-send-email-biju.das@bp.renesas.com (mailing list archive)
State	Accepted
Delegated to:	Pavel Machek
Headers	show Return-Path: <SRS0=KYNi=ZL=lists.cip-project.org=cip-dev-bounces@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C7AE20409 From: Biju Das <biju.das@bp.renesas.com> To: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>, Pavel Machek <pavel@denx.de> Date: Tue, 19 Nov 2019 13:36:08 +0000 Message-Id: <1574170570-15179-30-git-send-email-biju.das@bp.renesas.com> In-Reply-To: <1574170570-15179-1-git-send-email-biju.das@bp.renesas.com> References: <1574170570-15179-1-git-send-email-biju.das@bp.renesas.com> Cc: Biju Das <biju.das@bp.renesas.com> Subject: [cip-dev] [PATCH 4.4.y-cip 29/31] mmc: tmio: always get number of taps Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: cip-dev-bounces@lists.cip-project.org Sender: "cip-dev" <cip-dev-bounces@lists.cip-project.org>
Series	Add RZ/G1C SD/eMMC support \| expand [4.4.y-cip,00/31] Add RZ/G1C SD/eMMC support [4.4.y-cip,01/31] mmc: tmio-mmc: add support for 32bit data port [4.4.y-cip,02/31] mmc: sh_mobile_sdhi: add ocr_mask option [4.4.y-cip,03/31] mmc: tmio: enhance illegal sequence handling [4.4.y-cip,04/31] mmc: tmio: document mandatory and optional callbacks [4.4.y-cip,05/31] mmc: tmio: Add hw reset support [4.4.y-cip,06/31] mmc: core: Add helper to see if a host can be retuned [4.4.y-cip,07/31] mmc: tmio: Add tuning support [4.4.y-cip,08/31] mmc: sh_mobile_sdhi: Add tuning support [4.4.y-cip,09/31] mmc: tmio: fix wrong bitmask for SDIO irqs [4.4.y-cip,10/31] mmc: tmio: remove SDIO from TODO list [4.4.y-cip,11/31] mmc: tmio: use SDIO master interrupt bit only when allowed [4.4.y-cip,12/31] mmc: sh_mobile_sdhi: simplify accessing DT data [4.4.y-cip,13/31] mmc: sh_mobile_sdhi: improve prerequisite for hw_reset [4.4.y-cip,14/31] mmc: sh_mobile_sdhi: remove superfluous check in hw_reset [4.4.y-cip,15/31] mmc: sh_mobile_sdhi: improve prerequisites for tuning [4.4.y-cip,16/31] mmc: sh_mobile_sdhi: remove superfluous check in SCC error check [4.4.y-cip,17/31] mmc: sh_mobile_sdhi: remove superfluous check in init_tuning [4.4.y-cip,18/31] mmc: sh_mobile_sdhi: enable HS200 [4.4.y-cip,19/31] mmc: host: tmio: drop superfluous exit path [4.4.y-cip,20/31] mmc: tmio: Remove redundant check of mmc->slot.cd_irq [4.4.y-cip,21/31] mmc: host: tmio: disable clocks when unbinding [4.4.y-cip,22/31] mmc: host: tmio: refactor calls to sdio irq [4.4.y-cip,23/31] mmc: host: tmio: SDIO_STATUS_QUIRK is rather SDIO_STATUS_SETBITS [4.4.y-cip,24/31] mmc: tmio: discard obsolete SDIO irqs before enabling irqs [4.4.y-cip,25/31] mmc: tmio: ensure end of DMA and SD access are in sync [4.4.y-cip,26/31] mmc: host: tmio: use defines for CTL_STOP_INTERNAL_ACTION values [4.4.y-cip,27/31] mmc: host: tmio: don't BUG on unsupported stop commands [4.4.y-cip,28/31] mmc: host: tmio: fill in response from auto cmd12 [4.4.y-cip,29/31] mmc: tmio: always get number of taps [4.4.y-cip,30/31] mmc: tmio: drop filenames from comment at top of source [4.4.y-cip,31/31] mmc: renesas-sdhi, tmio: make dma more modular

Commit Message

Biju Das Nov. 19, 2019, 1:36 p.m. UTC

From: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>

commit 43b0b361b0170030603cf76f70b099f3323edcf3 upstream.

Current code gets number of taps only once and keeps the value. This is
not correct, we need to obtain it every time before executing tuning,
so remove the outer if-block.

Signed-off-by: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>
[wsa: extracted from a larger patch and reworded commit message]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
 drivers/mmc/host/tmio_mmc_pio.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 163646f..bcca0e2 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -817,16 +817,14 @@  static int tmio_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode)
 	struct tmio_mmc_host *host = mmc_priv(mmc);
 	int i, ret = 0;
 
-	if (!host->tap_num) {
-		if (!host->init_tuning || !host->select_tuning)
-			/* Tuning is not supported */
-			goto out;
+	if (!host->init_tuning || !host->select_tuning)
+		/* Tuning is not supported */
+		goto out;
 
-		host->tap_num = host->init_tuning(host);
-		if (!host->tap_num)
-			/* Tuning is not supported */
-			goto out;
-	}
+	host->tap_num = host->init_tuning(host);
+	if (!host->tap_num)
+		/* Tuning is not supported */
+		goto out;
 
 	if (host->tap_num * 2 >= sizeof(host->taps) * BITS_PER_BYTE) {
 		dev_warn_once(&host->pdev->dev,