Re: [PATCH 3/7] mmc: make the reference to sdhci_tegra_dt_pdata conditional

[Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>]

On Fri, Mar 18, 2011 at 09:22:03AM +0800, Shawn Guo wrote:
> On Thu, Mar 17, 2011 at 01:59:00PM -0600, Grant Likely wrote:
> > On Tue, Mar 15, 2011 at 1:58 AM, Grant Likely <grant.likely@secretlab.ca> wrote:
> > > On Mon, Mar 14, 2011 at 10:25:55PM +0800, Shawn Guo wrote:
> > >> Wrap tegra dt_id with CONFIG_MMC_SDHCI_TEGRA to make the reference to
> > >> sdhci_tegra_dt_pdata conditional, otherwise it will stop build for
> > >> other mmc driver when OF is enabled.
> > >>
> > >> Signed-off-by: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> > >
> > > Looks right to me.
> > 
> > Actually...
> > 
> > >
> > > g.
> > >
> > >> ---
> > >>  drivers/mmc/host/sdhci-pltfm.c |    2 ++
> > >>  1 files changed, 2 insertions(+), 0 deletions(-)
> > >>
> > >> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> > >> index ccc04ac..4125fbf 100644
> > >> --- a/drivers/mmc/host/sdhci-pltfm.c
> > >> +++ b/drivers/mmc/host/sdhci-pltfm.c
> > >> @@ -52,7 +52,9 @@ static struct sdhci_ops sdhci_pltfm_ops = {
> > >>  #if defined(CONFIG_OF)
> > >>  #include <linux/of_device.h>
> > >>  static const struct of_device_id sdhci_dt_ids[] = {
> > >> +#ifdef CONFIG_MMC_SDHCI_TEGRA
> > >>       { .compatible = "nvidia,tegra250-sdhci", .data = &sdhci_tegra_dt_pdata },
> > >> +#endif
> > >>       { }
> > >>  };
> > >>  MODULE_DEVICE_TABLE(platform, sdhci_dt_ids);
> > 
> > It would be better if the #ifdef went around the entire sdhci_dt_ids
> > table including the MODULE_DEVICE_TABLE registration.
> > 
> You really want to go this?  In that case, all the references to
> sdhci_dt_ids will have to get around by the #ifdef.

Sorry, my mistake.  I wasn't reading the patch correctly when I looked
at it again.  Your change is indeed correct.

g.