OSDN Git Service

spi: stm32: avoid ifdef CONFIG_PM for pm callbacks
authorAlain Volmat <alain.volmat@foss.st.com>
Fri, 12 Mar 2021 10:35:29 +0000 (11:35 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 12 Mar 2021 14:30:53 +0000 (14:30 +0000)
Avoid CONFIG_PM preprocessor check for pm suspend/resume
callbacks and identify the functions with __maybe_unused.

Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
Link: https://lore.kernel.org/r/1615545329-5496-1-git-send-email-alain.volmat@foss.st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-stm32.c

index 25c0764..3cc978e 100644 (file)
@@ -1976,8 +1976,7 @@ static int stm32_spi_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int stm32_spi_runtime_suspend(struct device *dev)
+static int __maybe_unused stm32_spi_runtime_suspend(struct device *dev)
 {
        struct spi_master *master = dev_get_drvdata(dev);
        struct stm32_spi *spi = spi_master_get_devdata(master);
@@ -1987,7 +1986,7 @@ static int stm32_spi_runtime_suspend(struct device *dev)
        return pinctrl_pm_select_sleep_state(dev);
 }
 
-static int stm32_spi_runtime_resume(struct device *dev)
+static int __maybe_unused stm32_spi_runtime_resume(struct device *dev)
 {
        struct spi_master *master = dev_get_drvdata(dev);
        struct stm32_spi *spi = spi_master_get_devdata(master);
@@ -1999,10 +1998,8 @@ static int stm32_spi_runtime_resume(struct device *dev)
 
        return clk_prepare_enable(spi->clk);
 }
-#endif
 
-#ifdef CONFIG_PM_SLEEP
-static int stm32_spi_suspend(struct device *dev)
+static int __maybe_unused stm32_spi_suspend(struct device *dev)
 {
        struct spi_master *master = dev_get_drvdata(dev);
        int ret;
@@ -2014,7 +2011,7 @@ static int stm32_spi_suspend(struct device *dev)
        return pm_runtime_force_suspend(dev);
 }
 
-static int stm32_spi_resume(struct device *dev)
+static int __maybe_unused stm32_spi_resume(struct device *dev)
 {
        struct spi_master *master = dev_get_drvdata(dev);
        struct stm32_spi *spi = spi_master_get_devdata(master);
@@ -2044,7 +2041,6 @@ static int stm32_spi_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
 static const struct dev_pm_ops stm32_spi_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(stm32_spi_suspend, stm32_spi_resume)