spi: spi-imx: Switch to RUNTIME_PM_OPS/SYSTEM_SLEEP_PM_OPS()
Subsystems (3)
Fabio Estevam
reviewerPATCH v2 1/2 spi: spi-imx: Switch to RUNTIME_PM_OPS/SYSTEM_SLEEP_PM_OPS()
From: Fabio Estevam <[email protected]>
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 notation from the runtime suspend/resume() functions.
---
Changes since v1:
- Pass pm_ptr().
drivers/spi/spi-imx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/spi/spi-imx.c +7 -8
@@ -1898,7 +1898,7 @@ static void spi_imx_remove(struct platform_device *pdev)spi_imx_sdma_exit (spi_imx); } -static int __maybe_unused spi_imx_runtime_resume (struct device *dev) +static int spi_imx_runtime_resume (struct device *dev) {struct spi_controller *controller =dev_get_drvdata (dev);struct spi_imx_data *spi_imx;
@@ -1919,7 +1919,7 @@ static int __maybe_unused spi_imx_runtime_resume(struct device *dev)return 0 ; } -static int __maybe_unused spi_imx_runtime_suspend (struct device *dev) +static int spi_imx_runtime_suspend (struct device *dev) {struct spi_controller *controller =dev_get_drvdata (dev);struct spi_imx_data *spi_imx;
@@ -1932,29 +1932,28 @@ static int __maybe_unused spi_imx_runtime_suspend(struct device *dev)return 0 ; } -static int __maybe_unused spi_imx_suspend (struct device *dev) +static int spi_imx_suspend (struct device *dev) {pinctrl_pm_select_sleep_state (dev);return 0 ; } -static int __maybe_unused spi_imx_resume (struct device *dev) +static int spi_imx_resume (struct device *dev) {pinctrl_pm_select_default_state (dev);return 0 ; }static const struct dev_pm_ops imx_spi_pm = { - SET_RUNTIME_PM_OPS(spi_imx_runtime_suspend, - spi_imx_runtime_resume, NULL) -SET_SYSTEM_SLEEP_PM_OPS (spi_imx_suspend, spi_imx_resume) + RUNTIME_PM_OPS(spi_imx_runtime_suspend, spi_imx_runtime_resume, NULL) +SYSTEM_SLEEP_PM_OPS (spi_imx_suspend, spi_imx_resume) };static struct platform_driver spi_imx_driver = { .driver = { .name =DRIVER_NAME , .of_match_table = spi_imx_dt_ids, - .pm = &imx_spi_pm, + .pm =pm_ptr (&imx_spi_pm), }, .probe = spi_imx_probe, .remove_new = spi_imx_remove,
Signature · 1 line
2.34.1
Fabio Estevam
reviewerPATCH v2 2/2 spi: spi-fsl-lpspi: Switch to SYSTEM_SLEEP_PM_OPS()
From: Fabio Estevam <[email protected]>
Replace SET_SYSTEM_SLEEP_PM_OPS with its modern SYSTEM_SLEEP_PM_OPS() alternative.
The combined usage of pm_ptr() and 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 notation from the runtime suspend/resume() functions.
---
Changes since v1:
- Pass pm_ptr().
drivers/spi/spi-fsl-lpspi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/spi/spi-fsl-lpspi.c +4 -4
@@ -960,13 +960,13 @@ static void fsl_lpspi_remove(struct platform_device *pdev)pm_runtime_disable (fsl_lpspi->dev); } -static int __maybe_unused fsl_lpspi_suspend (struct device *dev) +static int fsl_lpspi_suspend (struct device *dev) {pinctrl_pm_select_sleep_state (dev);return pm_runtime_force_suspend (dev); } -static int __maybe_unused fsl_lpspi_resume (struct device *dev) +static int fsl_lpspi_resume (struct device *dev) {int ret;
@@ -984,14 +984,14 @@ static int __maybe_unused fsl_lpspi_resume(struct device *dev)static const struct dev_pm_ops fsl_lpspi_pm_ops = { SET_RUNTIME_PM_OPS(fsl_lpspi_runtime_suspend, fsl_lpspi_runtime_resume, NULL) -SET_SYSTEM_SLEEP_PM_OPS (fsl_lpspi_suspend, fsl_lpspi_resume) +SYSTEM_SLEEP_PM_OPS (fsl_lpspi_suspend, fsl_lpspi_resume) };static struct platform_driver fsl_lpspi_driver = { .driver = { .name =DRIVER_NAME , .of_match_table = fsl_lpspi_dt_ids, - .pm = &fsl_lpspi_pm_ops, + .pm =pm_ptr (&fsl_lpspi_pm_ops), }, .probe = fsl_lpspi_probe, .remove_new = fsl_lpspi_remove,
Signature · 1 line
2.34.1