On Thu, May 05, 2011 at 09:22:56PM +0800, Shawn Guo wrote: > This patch is to consolidate SDHCI driver for Freescale eSDHC > controller found on both MPCxxx and i.MX platforms. It merges > sdhci-of-esdhc.c into sdhci-esdhc.c, so that the same pair of > .probe/.remove hook works with eSDHC for two platforms. > > As the results, sdhci-of-esdhc.c and sdhci-esdhc.h are removed, and > header esdhc.h containing the definition of esdhc_platform_data is > put into the public folder. > > Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx> I agree with Anton about not merging the two... > +#ifndef CONFIG_MMC_SDHCI_ESDHC_IMX > +#define cpu_is_mx25() (0) > +#define cpu_is_mx35() (0) > +#define cpu_is_mx51() (0) > +#define cpu_is_imx() (0) > +#else > +#define cpu_is_imx() (1) > +#endif ... e.g. that looks a bit frightening. -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature