mmc: sdhci_am654: use modern PM macros

Use the modern PM macros for the suspend and resume functions to be
automatically dropped by the compiler when CONFIG_PM or
CONFIG_PM_SLEEP are disabled, without having to use #ifdef guards.

This has the advantage of always compiling these functions in,
independently of any Kconfig option. Thanks to that, bugs and other
regressions are subsequently easier to catch.

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20250815013413.28641-17-jszhang@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index ffc45930c240afb2145f8a383971627cb8205a82..d235b0aecfdb126429aee121932ae308b6870d0f 100644 (file)
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -1035,7 +1035,6 @@ static void sdhci_am654_remove(struct platform_device *pdev)
        pm_runtime_put_noidle(dev);
 }
 
-#ifdef CONFIG_PM
 static int sdhci_am654_restore(struct sdhci_host *host)
 {
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -1123,20 +1122,17 @@ static int sdhci_am654_runtime_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
 static const struct dev_pm_ops sdhci_am654_dev_pm_ops = {
-       SET_RUNTIME_PM_OPS(sdhci_am654_runtime_suspend,
-                          sdhci_am654_runtime_resume, NULL)
-       SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-                               pm_runtime_force_resume)
+       RUNTIME_PM_OPS(sdhci_am654_runtime_suspend, sdhci_am654_runtime_resume, NULL)
+       SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
 };
 
 static struct platform_driver sdhci_am654_driver = {
        .driver = {
                .name = "sdhci-am654",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
-               .pm = &sdhci_am654_dev_pm_ops,
+               .pm = pm_ptr(&sdhci_am654_dev_pm_ops),
                .of_match_table = sdhci_am654_of_match,
        },
        .probe = sdhci_am654_probe,