tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mmc: sdhci-pltfm: Drop define for SDHCI_PLTFM_PMOPS

Due to previous changes this define has no longer a purpose. Instead move
the sdhci-pltfm drivers over to use the exported struct sdhci_pltfm_pmops.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Ulf Hansson fa243f64 2b330999

+8 -9
+1 -1
drivers/mmc/host/sdhci-bcm-kona.c
··· 326 326 static struct platform_driver sdhci_bcm_kona_driver = { 327 327 .driver = { 328 328 .name = "sdhci-kona", 329 - .pm = SDHCI_PLTFM_PMOPS, 329 + .pm = &sdhci_pltfm_pmops, 330 330 .of_match_table = sdhci_bcm_kona_of_match, 331 331 }, 332 332 .probe = sdhci_bcm_kona_probe,
+1 -1
drivers/mmc/host/sdhci-cns3xxx.c
··· 101 101 static struct platform_driver sdhci_cns3xxx_driver = { 102 102 .driver = { 103 103 .name = "sdhci-cns3xxx", 104 - .pm = SDHCI_PLTFM_PMOPS, 104 + .pm = &sdhci_pltfm_pmops, 105 105 }, 106 106 .probe = sdhci_cns3xxx_probe, 107 107 .remove = sdhci_pltfm_unregister,
+1 -1
drivers/mmc/host/sdhci-dove.c
··· 117 117 static struct platform_driver sdhci_dove_driver = { 118 118 .driver = { 119 119 .name = "sdhci-dove", 120 - .pm = SDHCI_PLTFM_PMOPS, 120 + .pm = &sdhci_pltfm_pmops, 121 121 .of_match_table = sdhci_dove_of_match_table, 122 122 }, 123 123 .probe = sdhci_dove_probe,
+1 -1
drivers/mmc/host/sdhci-iproc.c
··· 260 260 .driver = { 261 261 .name = "sdhci-iproc", 262 262 .of_match_table = sdhci_iproc_of_match, 263 - .pm = SDHCI_PLTFM_PMOPS, 263 + .pm = &sdhci_pltfm_pmops, 264 264 }, 265 265 .probe = sdhci_iproc_probe, 266 266 .remove = sdhci_pltfm_unregister,
+1 -1
drivers/mmc/host/sdhci-of-hlwd.c
··· 85 85 .driver = { 86 86 .name = "sdhci-hlwd", 87 87 .of_match_table = sdhci_hlwd_of_match, 88 - .pm = SDHCI_PLTFM_PMOPS, 88 + .pm = &sdhci_pltfm_pmops, 89 89 }, 90 90 .probe = sdhci_hlwd_probe, 91 91 .remove = sdhci_pltfm_unregister,
-1
drivers/mmc/host/sdhci-pltfm.h
··· 110 110 } 111 111 112 112 extern const struct dev_pm_ops sdhci_pltfm_pmops; 113 - #define SDHCI_PLTFM_PMOPS (&sdhci_pltfm_pmops) 114 113 115 114 #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */
+1 -1
drivers/mmc/host/sdhci-pxav2.c
··· 252 252 .driver = { 253 253 .name = "sdhci-pxav2", 254 254 .of_match_table = of_match_ptr(sdhci_pxav2_of_match), 255 - .pm = SDHCI_PLTFM_PMOPS, 255 + .pm = &sdhci_pltfm_pmops, 256 256 }, 257 257 .probe = sdhci_pxav2_probe, 258 258 .remove = sdhci_pxav2_remove,
+1 -1
drivers/mmc/host/sdhci-tegra.c
··· 483 483 .driver = { 484 484 .name = "sdhci-tegra", 485 485 .of_match_table = sdhci_tegra_dt_match, 486 - .pm = SDHCI_PLTFM_PMOPS, 486 + .pm = &sdhci_pltfm_pmops, 487 487 }, 488 488 .probe = sdhci_tegra_probe, 489 489 .remove = sdhci_pltfm_unregister,
+1 -1
drivers/mmc/host/sdhci_f_sdh30.c
··· 222 222 .driver = { 223 223 .name = "f_sdh30", 224 224 .of_match_table = f_sdh30_dt_ids, 225 - .pm = SDHCI_PLTFM_PMOPS, 225 + .pm = &sdhci_pltfm_pmops, 226 226 }, 227 227 .probe = sdhci_f_sdh30_probe, 228 228 .remove = sdhci_f_sdh30_remove,