mmc: dw_mmc: Rename dw_mci_pltfm_pmops to dw_mci_pmops

Since it's moved to dw_mmc core and resued by others variant host
drivers, so drop the pltfm notation.

Suggested-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/dw_mmc-bluefield.c b/drivers/mmc/host/dw_mmc-bluefield.c
index ed6dea42b18e8efc2ebdc72274d84d3482a45d33..81dc072d0e3f62ef005933bbc4ccc37b39039bc7 100644 (file)
--- a/drivers/mmc/host/dw_mmc-bluefield.c
+++ b/drivers/mmc/host/dw_mmc-bluefield.c
@@ -73,7 +73,7 @@ static struct platform_driver dw_mci_bluefield_pltfm_driver = {
                .name           = "dwmmc_bluefield",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = dw_mci_bluefield_match,
-               .pm             = pm_ptr(&dw_mci_pltfm_pmops),
+               .pm             = pm_ptr(&dw_mci_pmops),
        },
 };
 

diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c
index 8b1b4cf016ab4590e650b4845cb5cd69735e8e2e..59b802c9f2b86ee072a4fea2a06889d7cd9b5bb8 100644 (file)
--- a/drivers/mmc/host/dw_mmc-k3.c
+++ b/drivers/mmc/host/dw_mmc-k3.c
@@ -455,7 +455,7 @@ static struct platform_driver dw_mci_k3_pltfm_driver = {
                .name           = "dwmmc_k3",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = dw_mci_k3_match,
-               .pm             = pm_ptr(&dw_mci_pltfm_pmops),
+               .pm             = pm_ptr(&dw_mci_pmops),
        },
 };
 

diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c
index e046674c974899d9c66ea77003fcc9d93f3b3ebe..a2e1b4d75a5ee81cbfe2d706bd8bd9880d7795d3 100644 (file)
--- a/drivers/mmc/host/dw_mmc-pci.c
+++ b/drivers/mmc/host/dw_mmc-pci.c
@@ -84,7 +84,7 @@ static struct pci_driver dw_mci_pci_driver = {
        .probe          = dw_mci_pci_probe,
        .remove         = dw_mci_pci_remove,
        .driver         =       {
-               .pm =   pm_ptr(&dw_mci_pltfm_pmops),
+               .pm =   pm_ptr(&dw_mci_pmops),
        },
 };
 

diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index 079d0cc97766572bf14f6abfe8fe156fda8ec3ff..68770aaff8d999e77fcea972d433f17fb8f1a1a1 100644 (file)
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -125,7 +125,7 @@ static struct platform_driver dw_mci_pltfm_driver = {
                .name           = "dw_mmc",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = dw_mci_pltfm_match,
-               .pm             = &dw_mci_pltfm_pmops,
+               .pm             = pm_ptr(&dw_mci_pmops),
        },
 };
 

diff --git a/drivers/mmc/host/dw_mmc-pltfm.h b/drivers/mmc/host/dw_mmc-pltfm.h
index 64cf7522a3d49f2febc71daba0c9bb4b28eface3..ef1b05d484c3948c46bc8af4776cd7c51f0d1fd8 100644 (file)
--- a/drivers/mmc/host/dw_mmc-pltfm.h
+++ b/drivers/mmc/host/dw_mmc-pltfm.h
@@ -11,6 +11,6 @@
 extern int dw_mci_pltfm_register(struct platform_device *pdev,
                                const struct dw_mci_drv_data *drv_data);
 extern void dw_mci_pltfm_remove(struct platform_device *pdev);
-extern const struct dev_pm_ops dw_mci_pltfm_pmops;
+extern const struct dev_pm_ops dw_mci_pmops;
 
 #endif /* _DW_MMC_PLTFM_H_ */

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index d670c4be734224bce6e0636d00ab46c506a627b6..edea9f4a46cfc2c0584aa0db6d66733be17c5760 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -3523,11 +3523,11 @@ err:
 }
 EXPORT_SYMBOL(dw_mci_runtime_resume);
 
-const struct dev_pm_ops dw_mci_pltfm_pmops = {
+const struct dev_pm_ops dw_mci_pmops = {
        SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
        RUNTIME_PM_OPS(dw_mci_runtime_suspend, dw_mci_runtime_resume, NULL)
 };
-EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);
+EXPORT_SYMBOL_GPL(dw_mci_pmops);
 
 MODULE_DESCRIPTION("DW Multimedia Card Interface driver");
 MODULE_AUTHOR("NXP Semiconductor VietNam");