> -----Original Message----- > From: Axel Lin [mailto:axel.lin@xxxxxxxxxx] > Sent: Wednesday, March 20, 2013 3:49 PM > To: Chris Ball > Cc: Zhangfei Gao; Kevin Liu; Philip Rakity; linux-mmc@xxxxxxxxxxxxxxx > Subject: [PATCH] mmc: sdhci-{pxav2,pxav3}: Use of_match_ptr() macro > > This eliminates having an #ifdef returning NULL for the case > when OF is disabled. > > Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx> > --- > drivers/mmc/host/sdhci-pxav2.c | 4 +--- > drivers/mmc/host/sdhci-pxav3.c | 4 +--- > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c > index eeb7d43..d57c047 100644 > --- a/drivers/mmc/host/sdhci-pxav2.c > +++ b/drivers/mmc/host/sdhci-pxav2.c > @@ -262,9 +262,7 @@ static struct platform_driver sdhci_pxav2_driver = { > .driver = { > .name = "sdhci-pxav2", > .owner = THIS_MODULE, > -#ifdef CONFIG_OF > - .of_match_table = sdhci_pxav2_of_match, > -#endif > + .of_match_table = of_match_ptr(sdhci_pxav2_of_match), > .pm = SDHCI_PLTFM_PMOPS, > }, > .probe = sdhci_pxav2_probe, > diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c > index a0cdbc5..bbadfbd 100644 > --- a/drivers/mmc/host/sdhci-pxav3.c > +++ b/drivers/mmc/host/sdhci-pxav3.c > @@ -439,9 +439,7 @@ static const struct dev_pm_ops sdhci_pxav3_pmops = { > static struct platform_driver sdhci_pxav3_driver = { > .driver = { > .name = "sdhci-pxav3", > -#ifdef CONFIG_OF > - .of_match_table = sdhci_pxav3_of_match, > -#endif > + .of_match_table = of_match_ptr(sdhci_pxav3_of_match), > .owner = THIS_MODULE, > .pm = SDHCI_PXAV3_PMOPS, > }, > Reviewed-by: Kevin Liu <kliu5@xxxxxxxxxxx> -- > 1.7.9.5 > > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
