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 <trini@ti.com>

diff --git a/drivers/mmc/bfin_sdh.c b/drivers/mmc/bfin_sdh.c
index 7b35d8e7d932229b90a0287c5656ae4c404bf551..bcd6a3e52fd0d8fd7dbfca59278724f2046ba0db 100644 (file)
--- a/drivers/mmc/bfin_sdh.c
+++ b/drivers/mmc/bfin_sdh.c
@@ -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;

diff --git a/include/mmc.h b/include/mmc.h
index 0172979f1154c96ba3769a65f529a0df92e7807c..8a8297437bbb51261fe641ebfc7c58f9df4ae206 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -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