mmc: sdhci: Simplify tuning block size logic
authorAdrian Hunter <adrian.hunter@intel.com>
Fri, 2 Dec 2016 13:14:26 +0000 (15:14 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 5 Dec 2016 13:16:24 +0000 (14:16 +0100)
There are only 2 possible block sizes, so simplify 2 if-statements into 1.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci.c

index a6f8e164b3fdb46818af475e7be1fa4322b8fcdf..6fdec4ad4ad41e8811abc52c59e17c0aed01fd4f 100644 (file)
@@ -2031,17 +2031,11 @@ static void sdhci_send_tuning(struct sdhci_host *host, u32 opcode,
         * block to the Host Controller. So we set the block size
         * to 64 here.
         */
-       if (cmd.opcode == MMC_SEND_TUNING_BLOCK_HS200) {
-               if (mmc->ios.bus_width == MMC_BUS_WIDTH_8)
-                       sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 128),
-                                    SDHCI_BLOCK_SIZE);
-               else if (mmc->ios.bus_width == MMC_BUS_WIDTH_4)
-                       sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64),
-                                    SDHCI_BLOCK_SIZE);
-       } else {
-               sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64),
-                            SDHCI_BLOCK_SIZE);
-       }
+       if (cmd.opcode == MMC_SEND_TUNING_BLOCK_HS200 &&
+           mmc->ios.bus_width == MMC_BUS_WIDTH_8)
+               sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 128), SDHCI_BLOCK_SIZE);
+       else
+               sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64), SDHCI_BLOCK_SIZE);
 
        /*
         * The tuning block is sent by the card to the host controller.