[PATCH] mmc: dw_mmc: Rename dw_mci_pltfm_pmops to dw_mci_pmops

Shawn Lin posted 1 patch 1 month, 2 weeks ago
drivers/mmc/host/dw_mmc-bluefield.c | 2 +-
drivers/mmc/host/dw_mmc-k3.c        | 2 +-
drivers/mmc/host/dw_mmc-pci.c       | 2 +-
drivers/mmc/host/dw_mmc-pltfm.c     | 2 +-
drivers/mmc/host/dw_mmc-pltfm.h     | 2 +-
drivers/mmc/host/dw_mmc.c           | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
[PATCH] mmc: dw_mmc: Rename dw_mci_pltfm_pmops to dw_mci_pmops
Posted by Shawn Lin 1 month, 2 weeks ago
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>
---
 drivers/mmc/host/dw_mmc-bluefield.c | 2 +-
 drivers/mmc/host/dw_mmc-k3.c        | 2 +-
 drivers/mmc/host/dw_mmc-pci.c       | 2 +-
 drivers/mmc/host/dw_mmc-pltfm.c     | 2 +-
 drivers/mmc/host/dw_mmc-pltfm.h     | 2 +-
 drivers/mmc/host/dw_mmc.c           | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/mmc/host/dw_mmc-bluefield.c b/drivers/mmc/host/dw_mmc-bluefield.c
index ed6dea4..81dc072 100644
--- 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 8b1b4cf..59b802c 100644
--- 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 e046674..a2e1b4d 100644
--- 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 079d0cc..68770aa 100644
--- 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 64cf752..ef1b05d 100644
--- 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 97e8800..b2a6538 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -3523,11 +3523,11 @@ int dw_mci_runtime_resume(struct device *dev)
 }
 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);
 
 static int __init dw_mci_init(void)
 {
-- 
2.7.4
Re: [PATCH] mmc: dw_mmc: Rename dw_mci_pltfm_pmops to dw_mci_pmops
Posted by Ulf Hansson 1 month, 1 week ago
On Wed, 11 Feb 2026 at 15:00, Shawn Lin <shawn.lin@rock-chips.com> wrote:
>
> 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>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/dw_mmc-bluefield.c | 2 +-
>  drivers/mmc/host/dw_mmc-k3.c        | 2 +-
>  drivers/mmc/host/dw_mmc-pci.c       | 2 +-
>  drivers/mmc/host/dw_mmc-pltfm.c     | 2 +-
>  drivers/mmc/host/dw_mmc-pltfm.h     | 2 +-
>  drivers/mmc/host/dw_mmc.c           | 4 ++--
>  6 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc-bluefield.c b/drivers/mmc/host/dw_mmc-bluefield.c
> index ed6dea4..81dc072 100644
> --- 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 8b1b4cf..59b802c 100644
> --- 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 e046674..a2e1b4d 100644
> --- 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 079d0cc..68770aa 100644
> --- 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 64cf752..ef1b05d 100644
> --- 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 97e8800..b2a6538 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -3523,11 +3523,11 @@ int dw_mci_runtime_resume(struct device *dev)
>  }
>  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);
>
>  static int __init dw_mci_init(void)
>  {
> --
> 2.7.4
>