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>

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 5b01d22932cdbfc8958c0dfdf672f69ca3294871..a2d92f10501bdd9d7e2b1063d865775e20a059c2 100644 (file)
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -815,16 +815,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,