Skip to contentSkip to conversation

blackfin: mmc: Correct mmc_host_is_spi and bfin_sdh.c

PATCH New Tom Rini 1 participant 2 messages Mar 28, 2014 MMC, SD and SDIO

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 blackfin: mmc: Correct mmc_host_is_spi and bfin_sdh.c

In the recent mmc cleanup, the mmc_host_is_spi macro was broken and bfin_sdh.c had mmc->bus_width turned into mmc_bus_width(mmc), both of which were incorrect.

Signed-off-by Tom Rini <[email protected]>
---
 drivers/mmc/bfin_sdh.c |    2 +-
 include/mmc.h          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/bfin_sdh.c +1 -1
index 7b35d8e..bcd6a3e 100644
@@ -238,7 +238,7 @@ static void bfin_sdh_set_ios(struct mmc *mmc)
 	u16 cfg = 0;
 	u16 clk_ctl = 0;
 
-	if (mmc_bus_width(mmc) == 4) {
+	if (mmc->bus_width == 4) {
 		cfg = bfin_read_SDH_CFG();
 #ifndef RSI_BLKSZ
 		cfg &= ~PD_SDDAT3;
include/mmc.h +1 -1
index 0172979..8a82974 100644
@@ -360,7 +360,7 @@ void mmc_set_preinit(struct mmc *mmc, int preinit);
 
 #ifdef CONFIG_GENERIC_MMC
 #ifdef CONFIG_MMC_SPI
-#define mmc_host_is_spi(mmc)	((mmc)->cfg.host_caps & MMC_MODE_SPI)
+#define mmc_host_is_spi(mmc)	((mmc)->cfg->host_caps & MMC_MODE_SPI)
 #else
 #define mmc_host_is_spi(mmc)	0
 #endif
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/1 blackfin: mmc: Correct mmc_host_is_spi and bfin_sdh.c

Quoted 5 lines · Tom Rini

In the recent mmc cleanup, the mmc_host_is_spi macro was broken and bfin_sdh.c had mmc->bus_width turned into mmc_bus_width(mmc), both of which were incorrect.

Signed-off-by Tom Rini <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140328/1a76da87/attachment.pgp>