mmc: sdhci: calculate timeout_clk conditionally in sdhci_add_host

The timeout_clk calculation code in sdhci_add_host is meaningless for
SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.
So only execute them with no SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK set.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ff0e1c55d958..1e50880d57de 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2931,27 +2931,27 @@ int sdhci_add_host(struct sdhci_host *host)
         } else
                 mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200;
 
-        host->timeout_clk =
-                (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
-        if (host->timeout_clk == 0) {
-                if (host->ops->get_timeout_clock) {
-                        host->timeout_clk = host->ops->get_timeout_clock(host);
-                } else if (!(host->quirks &
-                                SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
-                        pr_err("%s: Hardware doesn't specify timeout clock "
-                               "frequency.\n", mmc_hostname(mmc));
-                        return -ENODEV;
+        if (!(host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
+                host->timeout_clk = (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >>
+                                        SDHCI_TIMEOUT_CLK_SHIFT;
+                if (host->timeout_clk == 0) {
+                        if (host->ops->get_timeout_clock) {
+                                host->timeout_clk =
+                                        host->ops->get_timeout_clock(host);
+                        } else {
+                                pr_err("%s: Hardware doesn't specify timeout clock frequency.\n",
+                                        mmc_hostname(mmc));
+                                return -ENODEV;
+                        }
                 }
-        }
-        if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
-                host->timeout_clk *= 1000;
 
-        if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
-                host->timeout_clk = mmc->f_max / 1000;
+                if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
+                        host->timeout_clk *= 1000;
 
-        mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
+                mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
                         host->ops->get_max_timeout_count(host) : 1 << 27;
-        mmc->max_busy_timeout /= host->timeout_clk;
+                mmc->max_busy_timeout /= host->timeout_clk;
+        }
 
         mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
         mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;