]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: stm32-ospi: avoid __maybe_unused and use pm_ptr
authorAlain Volmat <alain.volmat@foss.st.com>
Tue, 6 Jan 2026 12:14:18 +0000 (13:14 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 6 Jan 2026 12:23:37 +0000 (12:23 +0000)
Switch to usage of pm_ptr / SYSTEM_SLEEP_PM_OPS / RUNTIME_PM_OPS
in order to avoid having to mark the pm related functions as
__maybe_unused.

Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
Link: https://patch.msgid.link/20260106-spi_st_maybe_unused_removal-v1-2-8f5ca7136e96@foss.st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-stm32-ospi.c

index f36fd36da269221689c4bbc36933f0fae0dfc845..952db0eabb3db4c90b6f00f683466ac937c37ec2 100644 (file)
@@ -985,7 +985,7 @@ static void stm32_ospi_remove(struct platform_device *pdev)
        pm_runtime_force_suspend(ospi->dev);
 }
 
-static int __maybe_unused stm32_ospi_suspend(struct device *dev)
+static int stm32_ospi_suspend(struct device *dev)
 {
        struct stm32_ospi *ospi = dev_get_drvdata(dev);
 
@@ -996,7 +996,7 @@ static int __maybe_unused stm32_ospi_suspend(struct device *dev)
        return pm_runtime_force_suspend(ospi->dev);
 }
 
-static int __maybe_unused stm32_ospi_resume(struct device *dev)
+static int stm32_ospi_resume(struct device *dev)
 {
        struct stm32_ospi *ospi = dev_get_drvdata(dev);
        void __iomem *regs_base = ospi->regs_base;
@@ -1025,7 +1025,7 @@ static int __maybe_unused stm32_ospi_resume(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused stm32_ospi_runtime_suspend(struct device *dev)
+static int stm32_ospi_runtime_suspend(struct device *dev)
 {
        struct stm32_ospi *ospi = dev_get_drvdata(dev);
 
@@ -1034,7 +1034,7 @@ static int __maybe_unused stm32_ospi_runtime_suspend(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused stm32_ospi_runtime_resume(struct device *dev)
+static int stm32_ospi_runtime_resume(struct device *dev)
 {
        struct stm32_ospi *ospi = dev_get_drvdata(dev);
 
@@ -1042,9 +1042,8 @@ static int __maybe_unused stm32_ospi_runtime_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops stm32_ospi_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(stm32_ospi_suspend, stm32_ospi_resume)
-       SET_RUNTIME_PM_OPS(stm32_ospi_runtime_suspend,
-                          stm32_ospi_runtime_resume, NULL)
+       SYSTEM_SLEEP_PM_OPS(stm32_ospi_suspend, stm32_ospi_resume)
+       RUNTIME_PM_OPS(stm32_ospi_runtime_suspend, stm32_ospi_runtime_resume, NULL)
 };
 
 static const struct of_device_id stm32_ospi_of_match[] = {
@@ -1058,7 +1057,7 @@ static struct platform_driver stm32_ospi_driver = {
        .remove = stm32_ospi_remove,
        .driver = {
                .name = "stm32-ospi",
-               .pm = &stm32_ospi_pm_ops,
+               .pm = pm_ptr(&stm32_ospi_pm_ops),
                .of_match_table = stm32_ospi_of_match,
        },
 };