mmc: sdhci: put together into one condition checking

value of ios->timing is not related with SDCHI v3.0.  If Controller version
is v3.0, SDHCI_QUIRK_NO_HISPD_BIT is meaningless.  To prevent the setting
wrong bit moves into one condition checking.  (e.g sdhci-s3c doesn't use
SDHCI_CTRL_HISPD bit, instead using this bit as other purpose.)

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 42ef3ebb1d8cf9d57f30e48d21c3a5250aea16ea..146f442de1ad7ffcb81e6ec2fa6f1bd532b18e63 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1623,7 +1623,14 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
        ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
 
        if ((ios->timing == MMC_TIMING_SD_HS ||
-            ios->timing == MMC_TIMING_MMC_HS)
+            ios->timing == MMC_TIMING_MMC_HS ||
+            ios->timing == MMC_TIMING_MMC_HS400 ||
+            ios->timing == MMC_TIMING_MMC_HS200 ||
+            ios->timing == MMC_TIMING_MMC_DDR52 ||
+            ios->timing == MMC_TIMING_UHS_SDR50 ||
+            ios->timing == MMC_TIMING_UHS_SDR104 ||
+            ios->timing == MMC_TIMING_UHS_DDR50 ||
+            ios->timing == MMC_TIMING_UHS_SDR25)
            && !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT))
                ctrl |= SDHCI_CTRL_HISPD;
        else
@@ -1632,16 +1639,6 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
        if (host->version >= SDHCI_SPEC_300) {
                u16 clk, ctrl_2;
 
-               /* In case of UHS-I modes, set High Speed Enable */
-               if ((ios->timing == MMC_TIMING_MMC_HS400) ||
-                   (ios->timing == MMC_TIMING_MMC_HS200) ||
-                   (ios->timing == MMC_TIMING_MMC_DDR52) ||
-                   (ios->timing == MMC_TIMING_UHS_SDR50) ||
-                   (ios->timing == MMC_TIMING_UHS_SDR104) ||
-                   (ios->timing == MMC_TIMING_UHS_DDR50) ||
-                   (ios->timing == MMC_TIMING_UHS_SDR25))
-                       ctrl |= SDHCI_CTRL_HISPD;
-
                if (!host->preset_enabled) {
                        sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
                        /*