Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spi: st: fix PM macros to use CONFIG_PM instead of CONFIG_PM_SLEEP 

pm_sleep_ptr() depends on CONFIG_PM_SLEEP while pm_ptr() depends on
CONFIG_PM.  Since ST SSC4 implements runtime PM it makes sense using
pm_ptr() here.

For the same reason replace PM macros that use CONFIG_PM.  Doing so
prevents from using __maybe_unused attribute of runtime PM functions.

Link: https://lore.kernel.org/lkml/CAMuHMdX9nkROkAJJ5odv4qOWe0bFTmaFs=Rfxsfuc9+DT-bsEQ@mail.gmail.com
Fixes: 6f8584a482 ("spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()")

Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/20250820180310.9605-1-rgallaispou@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Raphael Gallais-Pou 2025-08-20 20:03:10 +02:00 committed by Mark Brown
parent 13d0fe84a2
commit 7c7cda8115
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/spi/spi-st-ssc4.c
View File

@ -378,7 +378,7 @@ static void spi_st_remove(struct platform_device *pdev)
pinctrl_pm_select_sleep_state(&pdev->dev); pinctrl_pm_select_sleep_state(&pdev->dev);
} }
static int __maybe_unused spi_st_runtime_suspend(struct device *dev) static int spi_st_runtime_suspend(struct device *dev)
{ {
struct spi_controller *host = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
struct spi_st *spi_st = spi_controller_get_devdata(host); struct spi_st *spi_st = spi_controller_get_devdata(host);
@ -391,7 +391,7 @@ static int __maybe_unused spi_st_runtime_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused spi_st_runtime_resume(struct device *dev) static int spi_st_runtime_resume(struct device *dev)
{ {
struct spi_controller *host = dev_get_drvdata(dev); struct spi_controller *host = dev_get_drvdata(dev);
struct spi_st *spi_st = spi_controller_get_devdata(host); struct spi_st *spi_st = spi_controller_get_devdata(host);
@ -428,8 +428,8 @@ static int __maybe_unused spi_st_resume(struct device *dev)
} }
static const struct dev_pm_ops spi_st_pm = { static const struct dev_pm_ops spi_st_pm = {
SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume) SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
SET_RUNTIME_PM_OPS(spi_st_runtime_suspend, spi_st_runtime_resume, NULL) RUNTIME_PM_OPS(spi_st_runtime_suspend, spi_st_runtime_resume, NULL)
}; };
static const struct of_device_id stm_spi_match[] = { static const struct of_device_id stm_spi_match[] = {
@ -441,7 +441,7 @@ MODULE_DEVICE_TABLE(of, stm_spi_match);
static struct platform_driver spi_st_driver = { static struct platform_driver spi_st_driver = {
.driver = { .driver = {
.name = "spi-st", .name = "spi-st",
.pm = pm_sleep_ptr(&spi_st_pm), .pm = pm_ptr(&spi_st_pm),
.of_match_table = of_match_ptr(stm_spi_match), .of_match_table = of_match_ptr(stm_spi_match),
}, },
.probe = spi_st_probe, .probe = spi_st_probe,