diff options
| author | Tom Rini <trini@ti.com> | 2014-03-28 16:55:29 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-28 16:55:29 -0400 |
| commit | 0b2da7e209f4110b7c81d578336a10330e4a4404 (patch) | |
| tree | ce26957a2c2dc0a59d148722a1ab1a918a1dd154 | |
| parent | 423ec7fed2e0877af412c5d787e9ad9d30f0ba5d (diff) | |
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>
| -rw-r--r-- | drivers/mmc/bfin_sdh.c | 2 | ||||
| -rw-r--r-- | include/mmc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/bfin_sdh.c b/drivers/mmc/bfin_sdh.c index 7b35d8e7d9..bcd6a3e52f 100644 --- 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 0172979f11..8a8297437b 100644 --- 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 |