[1/4] mmc: rename ddr to uhs in ios structure to indicate usage

Commit Message

Philip Rakity Feb. 14, 2011, 7:16 a.m. UTC

None

Patch

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index d9fb0d3..37e66d3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -718,7 +718,7 @@  void mmc_set_bus_width_ddr(struct mmc_host *host, unsigned int width,
 			   unsigned int ddr)
 {
 	host->ios.bus_width = width;
-	host->ios.ddr = ddr;
+	host->ios.uhs = ddr;
 	mmc_set_ios(host);
 }
 
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index bcb793e..f11307e 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -51,7 +51,7 @@  struct mmc_ios {
 #define MMC_TIMING_MMC_HS	1
 #define MMC_TIMING_SD_HS	2
 
-	unsigned char	ddr;			/* dual data rate used */
+	unsigned char	uhs;			/* uhs mode used (ddr - sdr) */
 
 #define MMC_SDR_MODE		0
 #define MMC_1_2V_DDR_MODE	1