On 5 May 2015 at 11:24, Jisheng Zhang <jszhang@xxxxxxxxxxx> wrote: > On Tue, 5 May 2015 02:11:54 -0700 > Axel Lin <axel.lin@xxxxxxxxxx> wrote: > >> 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 f98008b..beffd86 100644 >> --- a/drivers/mmc/host/sdhci-pxav2.c >> +++ b/drivers/mmc/host/sdhci-pxav2.c >> @@ -252,9 +252,7 @@ static int sdhci_pxav2_remove(struct platform_device *pdev) >> static struct platform_driver sdhci_pxav2_driver = { >> .driver = { >> .name = "sdhci-pxav2", >> -#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 b5103a2..01cb2d3 100644 >> --- a/drivers/mmc/host/sdhci-pxav3.c >> +++ b/drivers/mmc/host/sdhci-pxav3.c >> @@ -578,9 +578,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), >> .pm = SDHCI_PXAV3_PMOPS, >> }, >> .probe = sdhci_pxav3_probe, > > Looks good to me. > > Thanks I consider that as an ack. Thanks, applied. Kind regards Uffe -- 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