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>

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>
Tom Rini
1 parent 423ec7fed2
Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff
drivers/mmc/bfin_sdh.c
include/mmc.h
@@ -238,7 +238,7 @@
 	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;
@@ -360,7 +360,7 @@
  
 #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
...	...	@@ -238,7 +238,7 @@
238	238	u16 cfg = 0;
239	239	u16 clk_ctl = 0;
240	240
241		- if (mmc_bus_width(mmc) == 4) {
	241	+ if (mmc->bus_width == 4) {
242	242	cfg = bfin_read_SDH_CFG();
243	243	#ifndef RSI_BLKSZ
244	244	cfg &= ~PD_SDDAT3;
...	...	@@ -360,7 +360,7 @@
360	360
361	361	#ifdef CONFIG_GENERIC_MMC
362	362	#ifdef CONFIG_MMC_SPI
363		-#define mmc_host_is_spi(mmc) ((mmc)->cfg.host_caps & MMC_MODE_SPI)
	363	+#define mmc_host_is_spi(mmc) ((mmc)->cfg->host_caps & MMC_MODE_SPI)
364	364	#else
365	365	#define mmc_host_is_spi(mmc) 0
366	366	#endif