From mboxrd@z Thu Jan 1 00:00:00 1970 From: w.sang@pengutronix.de (Wolfram Sang) Date: Tue, 24 May 2011 21:40:54 +0200 Subject: [PATCH v2 5/7] mmc: sdhci: consolidate sdhci-of-esdhc and sdhci-esdhc-imx In-Reply-To: <1304601778-13837-6-git-send-email-shawn.guo@linaro.org> References: <1304601778-13837-1-git-send-email-shawn.guo@linaro.org> <1304601778-13837-6-git-send-email-shawn.guo@linaro.org> Message-ID: <20110524194054.GC25727@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 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/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: