[PATCH] OMAP: mmc: remove ifdef in omap_mmc_platform_data defination

[PATCH] OMAP: mmc: remove ifdef in omap_mmc_platform_data defination

[tom.leiming]

From: Ming Lei <tom.leiming@gmail.com>

The instance of omap_mmc_platform_data is alwasy passed to
mmc omap host driver from board, so remove ifdef in omap_mmc_platform_data
defination to simplify handling it in mmc omap host driver.

The patch fixes the compile error below:

drivers/mmc/host/omap.c: In function 'mmc_omap_new_slot':
drivers/mmc/host/omap.c:1320: error: 'struct omap_mmc_slot_data' has no member named 'wires'
make[3]: *** [drivers/mmc/host/omap.o] Error 1
make[2]: *** [drivers/mmc/host] Error 2
make[1]: *** [drivers/mmc] Error 2
make: *** [drivers] Error 2

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
 arch/arm/plat-omap/include/plat/mmc.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h
index 3107892..f57f36a 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -80,12 +80,8 @@ struct omap_mmc_platform_data {
 		 * 4/8 wires and any additional host capabilities
 		 * need to OR'd all capabilities (ref. linux/mmc/host.h)
 		 */
-#if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2420)
 		u8  wires;	/* Used for the MMC driver on omap1 and 2420 */
-#endif
-#ifdef CONFIG_ARCH_OMAP2PLUS
 		u32 caps;	/* Used for the MMC driver on 2430 and later */
-#endif
 
 		/*
 		 * nomux means "standard" muxing is wrong on this board, and
-- 
1.7.3

Re: [PATCH] OMAP: mmc: remove ifdef in omap_mmc_platform_data defination

[Tony Lindgren]

* tom.leiming@gmail.com <tom.leiming@gmail.com> [101004 09:45]:
> From: Ming Lei <tom.leiming@gmail.com>
> 
> The instance of omap_mmc_platform_data is alwasy passed to
> mmc omap host driver from board, so remove ifdef in omap_mmc_platform_data
> defination to simplify handling it in mmc omap host driver.
 
OK, let's do this. Eventually we can convert omap1/2420 MMC controller
to use caps also.

> The patch fixes the compile error below:
> 
> drivers/mmc/host/omap.c: In function 'mmc_omap_new_slot':
> drivers/mmc/host/omap.c:1320: error: 'struct omap_mmc_slot_data' has no member named 'wires'
> make[3]: *** [drivers/mmc/host/omap.o] Error 1
> make[2]: *** [drivers/mmc/host] Error 2
> make[1]: *** [drivers/mmc] Error 2
> make: *** [drivers] Error 2

I'll merge this into the earlier patch "omap: Keep nwires for omap1
and 2420 MMC controller".

Regards,

Tony