Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mmc: sdhci-{pxav2,pxav3}: Use of_match_ptr() macro

Browse source 
This eliminates having an #ifdef returning NULL for the case
when OF is disabled.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Axel Lin 2015-05-05 17:11:54 +08:00 committed by Ulf Hansson
parent 308f3f8d81
commit 59d22309c4
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mmc/host/sdhci-pxav2.c
View file

@ -252,9 +252,7 @@ static int sdhci_pxav2_remove(struct platform_device *pdev)
static struct platform_driver sdhci_pxav2_driver = { static struct platform_driver sdhci_pxav2_driver = {
.driver = { .driver = {
.name = "sdhci-pxav2", .name = "sdhci-pxav2",
#ifdef CONFIG_OF .of_match_table = of_match_ptr(sdhci_pxav2_of_match),
.of_match_table = sdhci_pxav2_of_match,
#endif
.pm = SDHCI_PLTFM_PMOPS, .pm = SDHCI_PLTFM_PMOPS,
}, },
.probe = sdhci_pxav2_probe, .probe = sdhci_pxav2_probe,

4
drivers/mmc/host/sdhci-pxav3.c
View file

@ -578,9 +578,7 @@ static const struct dev_pm_ops sdhci_pxav3_pmops = {
static struct platform_driver sdhci_pxav3_driver = { static struct platform_driver sdhci_pxav3_driver = {
.driver = { .driver = {
.name = "sdhci-pxav3", .name = "sdhci-pxav3",
#ifdef CONFIG_OF .of_match_table = of_match_ptr(sdhci_pxav3_of_match),
.of_match_table = sdhci_pxav3_of_match,
#endif
.pm = SDHCI_PXAV3_PMOPS, .pm = SDHCI_PXAV3_PMOPS,
}, },
.probe = sdhci_pxav3_probe, .probe = sdhci_pxav3_probe,