Commit 43b0b361 authored Mar 17, 2017 by Masaharu Hayakawa Committed by Ulf Hansson Apr 24, 2017

mmc: tmio: always get number of taps



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>

parent 5f07ef8f

drivers/mmc/host/tmio_mmc_pio.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -815,7 +815,6 @@ 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;
		@@ -824,7 +823,6 @@ static int tmio_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode)
		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,