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>

diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 1d6471284ae42657fe2002f7a96bfd7844ac627b..e5c634bdfdd909f20b6468c9fefc5b6ecca909c7 100644 (file)
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -326,7 +326,7 @@ err_pltfm_free:
 static struct platform_driver sdhci_bcm_kona_driver = {
        .driver         = {
                .name   = "sdhci-kona",
-               .pm     = SDHCI_PLTFM_PMOPS,
+               .pm     = &sdhci_pltfm_pmops,
                .of_match_table = sdhci_bcm_kona_of_match,
        },
        .probe          = sdhci_bcm_kona_probe,

diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c
index 59f2923f80547d37f2dd5d8f43d3aeacb49854ce..bd286db7f9af54e8c0884a2c34b080e5e712e8d2 100644 (file)
--- a/drivers/mmc/host/sdhci-cns3xxx.c
+++ b/drivers/mmc/host/sdhci-cns3xxx.c
@@ -101,7 +101,7 @@ static int sdhci_cns3xxx_probe(struct platform_device *pdev)
 static struct platform_driver sdhci_cns3xxx_driver = {
        .driver         = {
                .name   = "sdhci-cns3xxx",
-               .pm     = SDHCI_PLTFM_PMOPS,
+               .pm     = &sdhci_pltfm_pmops,
        },
        .probe          = sdhci_cns3xxx_probe,
        .remove         = sdhci_pltfm_unregister,

diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
index 407c21f152b2dacad43706db77b8a2c5a97c08e8..de9f9603dbdcb21e848ccee5fe9e0093cdeb0da7 100644 (file)
--- a/drivers/mmc/host/sdhci-dove.c
+++ b/drivers/mmc/host/sdhci-dove.c
@@ -117,7 +117,7 @@ MODULE_DEVICE_TABLE(of, sdhci_dove_of_match_table);
 static struct platform_driver sdhci_dove_driver = {
        .driver         = {
                .name   = "sdhci-dove",
-               .pm     = SDHCI_PLTFM_PMOPS,
+               .pm     = &sdhci_pltfm_pmops,
                .of_match_table = sdhci_dove_of_match_table,
        },
        .probe          = sdhci_dove_probe,

diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
index 53abecc4cadaf466c8c8da6c83ab9cca5bf9c8a2..72624666585008866dfea479b74112a642dd9059 100644 (file)
--- a/drivers/mmc/host/sdhci-iproc.c
+++ b/drivers/mmc/host/sdhci-iproc.c
@@ -260,7 +260,7 @@ static struct platform_driver sdhci_iproc_driver = {
        .driver = {
                .name = "sdhci-iproc",
                .of_match_table = sdhci_iproc_of_match,
-               .pm = SDHCI_PLTFM_PMOPS,
+               .pm = &sdhci_pltfm_pmops,
        },
        .probe = sdhci_iproc_probe,
        .remove = sdhci_pltfm_unregister,

diff --git a/drivers/mmc/host/sdhci-of-hlwd.c b/drivers/mmc/host/sdhci-of-hlwd.c
index 4079a96ad37e46e23522e11682f232191c50613d..ac00c5efb2a3279cf56c01b67bdbd7736d67e2e4 100644 (file)
--- a/drivers/mmc/host/sdhci-of-hlwd.c
+++ b/drivers/mmc/host/sdhci-of-hlwd.c
@@ -85,7 +85,7 @@ static struct platform_driver sdhci_hlwd_driver = {
        .driver = {
                .name = "sdhci-hlwd",
                .of_match_table = sdhci_hlwd_of_match,
-               .pm = SDHCI_PLTFM_PMOPS,
+               .pm = &sdhci_pltfm_pmops,
        },
        .probe = sdhci_hlwd_probe,
        .remove = sdhci_pltfm_unregister,

diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
index 0883a2a5caf06eca4b4b47316b9acb80c23d194b..3280f207795939138ff5ec0d2689184e0f48f172 100644 (file)
--- a/drivers/mmc/host/sdhci-pltfm.h
+++ b/drivers/mmc/host/sdhci-pltfm.h
@@ -110,6 +110,5 @@ static inline void *sdhci_pltfm_priv(struct sdhci_pltfm_host *host)
 }
 
 extern const struct dev_pm_ops sdhci_pltfm_pmops;
-#define SDHCI_PLTFM_PMOPS (&sdhci_pltfm_pmops)
 
 #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */

diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index 1d8dd35406361bd3aa5cdf85928d41227b21f714..347eae2d7b6a7b5d05acee8a66fd85cb14c45735 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -252,7 +252,7 @@ static struct platform_driver sdhci_pxav2_driver = {
        .driver         = {
                .name   = "sdhci-pxav2",
                .of_match_table = of_match_ptr(sdhci_pxav2_of_match),
-               .pm     = SDHCI_PLTFM_PMOPS,
+               .pm     = &sdhci_pltfm_pmops,
        },
        .probe          = sdhci_pxav2_probe,
        .remove         = sdhci_pxav2_remove,

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index bd1199825f9f740af1f0de5032253fb7954e0bab..1e93dc4e303e4f5a31dae97d48955d4dd8bfa7a6 100644 (file)
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -483,7 +483,7 @@ static struct platform_driver sdhci_tegra_driver = {
        .driver         = {
                .name   = "sdhci-tegra",
                .of_match_table = sdhci_tegra_dt_match,
-               .pm     = SDHCI_PLTFM_PMOPS,
+               .pm     = &sdhci_pltfm_pmops,
        },
        .probe          = sdhci_tegra_probe,
        .remove         = sdhci_pltfm_unregister,

diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
index 983b8b32ef960057ea0f09ee309de5e7ae1e842c..111b66f5439bc25a33c8ed1d8e925ce39d417bb1 100644 (file)
--- a/drivers/mmc/host/sdhci_f_sdh30.c
+++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -222,7 +222,7 @@ static struct platform_driver sdhci_f_sdh30_driver = {
        .driver = {
                .name = "f_sdh30",
                .of_match_table = f_sdh30_dt_ids,
-               .pm     = SDHCI_PLTFM_PMOPS,
+               .pm     = &sdhci_pltfm_pmops,
        },
        .probe  = sdhci_f_sdh30_probe,
        .remove = sdhci_f_sdh30_remove,