| From bc21d58162e277dd0cac98d4c65e24b508cd520d Mon Sep 17 00:00:00 2001 |
| From: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com> |
| Date: Fri, 17 Mar 2017 10:04:50 +0100 |
| Subject: [PATCH 122/286] 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> |
| |
| (cherry picked from commit 43b0b361b0170030603cf76f70b099f3323edcf3) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc_pio.c | 16 +++++++--------- |
| 1 file changed, 7 insertions(+), 9 deletions(-) |
| |
| --- 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(struc |
| 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, |
