spi: mxs: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS()
authorFabio Estevam <festevam@denx.de>
Mon, 2 Sep 2024 18:46:55 +0000 (15:46 -0300)
committerMark Brown <broonie@kernel.org>
Tue, 3 Sep 2024 21:07:58 +0000 (22:07 +0100)
Replace SET_RUNTIME_PM_OPS()/SET SYSTEM_SLEEP_PM_OPS() with their modern
RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS() alternatives.

The combined usage of pm_ptr() and RUNTIME_PM_OPS/SYSTEM_SLEEP_PM_OPS()
allows the compiler to evaluate if the runtime suspend/resume() functions
are used at build time or are simply dead code.

This allows removing the __maybe_unused annotations from the
suspend/resume() functions.

Signed-off-by: Fabio Estevam <festevam@denx.de>
Link: https://patch.msgid.link/20240902184655.932699-1-festevam@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mxs.c

index 88cbe4f00cc3b11e5fef822a60114a90a88149f8..3e341d1ff3b63be96ba7a54be34ba69a2abdf36a 100644 (file)
@@ -477,7 +477,7 @@ static int mxs_spi_runtime_resume(struct device *dev)
        return ret;
 }
 
-static int __maybe_unused mxs_spi_suspend(struct device *dev)
+static int mxs_spi_suspend(struct device *dev)
 {
        struct spi_controller *host = dev_get_drvdata(dev);
        int ret;
@@ -492,7 +492,7 @@ static int __maybe_unused mxs_spi_suspend(struct device *dev)
                return 0;
 }
 
-static int __maybe_unused mxs_spi_resume(struct device *dev)
+static int mxs_spi_resume(struct device *dev)
 {
        struct spi_controller *host = dev_get_drvdata(dev);
        int ret;
@@ -512,9 +512,8 @@ static int __maybe_unused mxs_spi_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops mxs_spi_pm = {
-       SET_RUNTIME_PM_OPS(mxs_spi_runtime_suspend,
-                          mxs_spi_runtime_resume, NULL)
-       SET_SYSTEM_SLEEP_PM_OPS(mxs_spi_suspend, mxs_spi_resume)
+       RUNTIME_PM_OPS(mxs_spi_runtime_suspend, mxs_spi_runtime_resume, NULL)
+       SYSTEM_SLEEP_PM_OPS(mxs_spi_suspend, mxs_spi_resume)
 };
 
 static const struct of_device_id mxs_spi_dt_ids[] = {
@@ -662,7 +661,7 @@ static struct platform_driver mxs_spi_driver = {
        .driver = {
                .name   = DRIVER_NAME,
                .of_match_table = mxs_spi_dt_ids,
-               .pm = &mxs_spi_pm,
+               .pm = pm_ptr(&mxs_spi_pm),
        },
 };