mmc: meson-gx: minor improvements in meson_mmc_set_ios

val isn't used in the switch clause and afterwards there's an
identical statement. So remove it.

In case of an unexpected bus width the error message indicates
the intention to set the bus width to 4 and to go on.
So remove the return statement. This return statement also
conflicts with "setting to 4" because nothing would be set
actually before returning. 4bit bus width are chosen as
default as the vendor driver does it too.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index ef2ce725c31d0c9914a219aa9e2f0cc396cd65b2..9d79df7ca2142a6036abb82ca5ec4ed5630cfedf 100644 (file)
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -371,7 +371,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
        meson_mmc_clk_set(host, ios->clock);
 
        /* Bus width */
-       val = readl(host->regs + SD_EMMC_CFG);
        switch (ios->bus_width) {
        case MMC_BUS_WIDTH_1:
                bus_width = CFG_BUS_WIDTH_1;
@@ -386,7 +385,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                dev_err(host->dev, "Invalid ios->bus_width: %u.  Setting to 4.\n",
                        ios->bus_width);
                bus_width = CFG_BUS_WIDTH_4;
-               return;
        }
 
        val = readl(host->regs + SD_EMMC_CFG);