Skip to contentSkip to conversation

mmc: meson-gx: minor improvements in meson_mmc_set_ios

PATCH New Heiner Kallweit 2 participants 2 messages Jan 26, 2017 – Jan 27, 2017

Subsystems (2)
Arm/Amlogic Meson SoC support MMC, SD and SDIO
lore
Share & tools
lore

Heiner Kallweit

author
#0 lore raw

PATCH 2/3 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.

Signed-off-by Heiner Kallweit <[email protected]>
---
 drivers/mmc/host/meson-gx-mmc.c | 2 --
 1 file changed, 2 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +0 -2
index cf071756..41c54e02 100644
@@ -379,7 +379,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;

@@ -394,7 +393,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);
Signature · 1 line
2.11.0
maintainer
#1 lore raw

PATCH 2/3 mmc: meson-gx: minor improvements in meson_mmc_set_ios

Quoted 10 lines · Heiner Kallweit

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.

Signed-off-by Heiner Kallweit <[email protected]>
Acked-by Kevin Hilman <[email protected]>

Thanks for the fix,

Kevin