Skip to contentSkip to conversation

spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()

PATCH In review Raphael Gallais-Pou 3 participants 7 messages Jun 9, 2025 – Jul 30, 2025 SPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()

Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards.

---
 drivers/spi/spi-st-ssc4.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/spi/spi-st-ssc4.c +5 -9
index 4cff976ab16fbdf3708ab870176a04f2628b501b..49ab4c515156fbabe0761028a5cb4770b61ca508 100644
@@ -378,8 +378,7 @@ static void spi_st_remove(struct platform_device *pdev)
 	pinctrl_pm_select_sleep_state(&pdev->dev);
 }
 
-#ifdef CONFIG_PM
-static int spi_st_runtime_suspend(struct device *dev)
+static int __maybe_unused spi_st_runtime_suspend(struct device *dev)
 {
 	struct spi_controller *host = dev_get_drvdata(dev);
 	struct spi_st *spi_st = spi_controller_get_devdata(host);
@@ -392,7 +391,7 @@ static int spi_st_runtime_suspend(struct device *dev)
 	return 0;
 }
 
-static int spi_st_runtime_resume(struct device *dev)
+static int __maybe_unused spi_st_runtime_resume(struct device *dev)
 {
 	struct spi_controller *host = dev_get_drvdata(dev);
 	struct spi_st *spi_st = spi_controller_get_devdata(host);
@@ -403,10 +402,8 @@ static int spi_st_runtime_resume(struct device *dev)
 
 	return ret;
 }
-#endif
 
-#ifdef CONFIG_PM_SLEEP
-static int spi_st_suspend(struct device *dev)
+static int __maybe_unused spi_st_suspend(struct device *dev)
 {
 	struct spi_controller *host = dev_get_drvdata(dev);
 	int ret;
@@ -418,7 +415,7 @@ static int spi_st_suspend(struct device *dev)
 	return pm_runtime_force_suspend(dev);
 }
 
-static int spi_st_resume(struct device *dev)
+static int __maybe_unused spi_st_resume(struct device *dev)
 {
 	struct spi_controller *host = dev_get_drvdata(dev);
 	int ret;
@@ -429,7 +426,6 @@ static int spi_st_resume(struct device *dev)
 
 	return pm_runtime_force_resume(dev);
 }
-#endif
 
 static const struct dev_pm_ops spi_st_pm = {
 	SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
@@ -445,7 +441,7 @@ MODULE_DEVICE_TABLE(of, stm_spi_match);
 static struct platform_driver spi_st_driver = {
 	.driver = {
 		.name = "spi-st",
-		.pm = &spi_st_pm,
+		.pm = pm_sleep_ptr(&spi_st_pm),
 		.of_match_table = of_match_ptr(stm_spi_match),
 	},
 	.probe = spi_st_probe,

---
base-commit: 475c850a7fdd0915b856173186d5922899d65686
change-id: 20250609-update_pm_macro-b6def2446904

Best regards,

Signature · 1 line
Raphael Gallais-Pou <[email protected]>
#1 lore raw

Le 09/06/2025 à 23:21, Raphael Gallais-Pou a écrit :

Quoted 5 lines

Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards.

Hi Mark,

Gentle ping ! :)

Thanks,
Raphaël

Quoted 71 lines
---
  drivers/spi/spi-st-ssc4.c | 14 +++++---------
  1 file changed, 5 insertions(+), 9 deletions(-)
drivers/spi/spi-st-ssc4.c +5 -10
index 4cff976ab16fbdf3708ab870176a04f2628b501b..49ab4c515156fbabe0761028a5cb4770b61ca508 100644
@@ -378,8 +378,7 @@ static void spi_st_remove(struct platform_device *pdev)
  	pinctrl_pm_select_sleep_state(&pdev->dev);
  }
 
-#ifdef CONFIG_PM
-static int spi_st_runtime_suspend(struct device *dev)
+static int __maybe_unused spi_st_runtime_suspend(struct device *dev)
  {
  	struct spi_controller *host = dev_get_drvdata(dev);
  	struct spi_st *spi_st = spi_controller_get_devdata(host);
@@ -392,7 +391,7 @@ static int spi_st_runtime_suspend(struct device *dev)
  	return 0;
  }
 
-static int spi_st_runtime_resume(struct device *dev)
+static int __maybe_unused spi_st_runtime_resume(struct device *dev)
  {
  	struct spi_controller *host = dev_get_drvdata(dev);
  	struct spi_st *spi_st = spi_controller_get_devdata(host);
@@ -403,10 +402,8 @@ static int spi_st_runtime_resume(struct device *dev)
 
  	return ret;
  }
-#endif
 
-#ifdef CONFIG_PM_SLEEP
-static int spi_st_suspend(struct device *dev)
+static int __maybe_unused spi_st_suspend(struct device *dev)
  {
  	struct spi_controller *host = dev_get_drvdata(dev);
  	int ret;
@@ -418,7 +415,7 @@ static int spi_st_suspend(struct device *dev)
  	return pm_runtime_force_suspend(dev);
  }
 
-static int spi_st_resume(struct device *dev)
+static int __maybe_unused spi_st_resume(struct device *dev)
  {
  	struct spi_controller *host = dev_get_drvdata(dev);
  	int ret;
@@ -429,7 +426,6 @@ static int spi_st_resume(struct device *dev)
 
  	return pm_runtime_force_resume(dev);
  }
-#endif
 
  static const struct dev_pm_ops spi_st_pm = {
  	SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
@@ -445,7 +441,7 @@ MODULE_DEVICE_TABLE(of, stm_spi_match);
  static struct platform_driver spi_st_driver = {
  	.driver = {
  		.name = "spi-st",
-		.pm = &spi_st_pm,
+		.pm = pm_sleep_ptr(&spi_st_pm),
  		.of_match_table = of_match_ptr(stm_spi_match),
  	},
  	.probe = spi_st_probe,
 
---

base-commit: 475c850a7fdd0915b856173186d5922899d65686
change-id: 20250609-update_pm_macro-b6def2446904

Best regards,

maintainer
#2 lore raw
Quoted 10 lines · Raphaël Gallais-Pou

Le 09/06/2025 à 23:21, Raphael Gallais-Pou a écrit :

Quoted 5 lines

Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards.

Hi Mark,

Gentle ping ! :)

Please don't send content free pings and please allow a reasonable time for review. People get busy, go on holiday, attend conferences and so on so unless there is some reason for urgency (like critical bug fixes) please allow at least a couple of weeks for review. If there have been review comments then people may be waiting for those to be addressed.

Sending content free pings adds to the mail volume (if they are seen at all) which is often the problem and since they can't be reviewed directly if something has gone wrong you'll have to resend the patches anyway, so sending again is generally a better approach though there are some other maintainers who like them - if in doubt look at how patches for the subsystem are normally handled.

maintainer
#3 lore raw
In reply to Raphael Gallais-Pou
Quoted 5 lines · Raphael Gallais-Pou

Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()

      commit: 6f8584a4826f01a55d3d0c4bbad5961f1de52fc9

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

#4 lore raw
In reply to Raphael Gallais-Pou

Hi Raphael,

Quoted 5 lines · Raphael Gallais-Pou

Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards.

Thanks for your patch, which is now commit 7d61715c58a39edc ("spi:
rspi: Convert to DEFINE_SIMPLE_DEV_PM_OPS()") in spi/for-next.

drivers/spi/spi-st-ssc4.c static void spi_st_remove(struct platform_device *pdev) · line 381

Quoted 9 lines
drivers/spi/spi-st-ssc4.c +1 -2
@@ -378,8 +378,7 @@ static void spi_st_remove(struct platform_device *pdev)
        pinctrl_pm_select_sleep_state(&pdev->dev);
 }
 
-#ifdef CONFIG_PM
-static int spi_st_runtime_suspend(struct device *dev)
+static int __maybe_unused spi_st_runtime_suspend(struct device *dev)

The __maybe_unused can be removed, too...

drivers/spi/spi-st-ssc4.c static int spi_st_resume(struct device *dev) · line 431

Quoted 8 lines
drivers/spi/spi-st-ssc4.c +0 -1
@@ -429,7 +426,6 @@ static int spi_st_resume(struct device *dev)
 
        return pm_runtime_force_resume(dev);
 }
-#endif
 
 static const struct dev_pm_ops spi_st_pm = {
        SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)

... if you would update these, too:

    -    SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
    -    SET_RUNTIME_PM_OPS(spi_st_runtime_suspend, spi_st_runtime_resume, NULL)
    +    SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
    +    RUNTIME_PM_OPS(spi_st_runtime_suspend, spi_st_runtime_resume, NULL)

drivers/spi/spi-st-ssc4.c MODULE_DEVICE_TABLE(of, stm_spi_match); · line 444

Quoted 6 lines
drivers/spi/spi-st-ssc4.c +1 -1
@@ -445,7 +441,7 @@ MODULE_DEVICE_TABLE(of, stm_spi_match);
 static struct platform_driver spi_st_driver = {
        .driver = {
                .name = "spi-st",
-               .pm = &spi_st_pm,
+               .pm = pm_sleep_ptr(&spi_st_pm),

This should use pm_ptr() instead, as spi_st_pm defines not only system sleep ops, but also Runtime PM ops.

drivers/spi/spi-st-ssc4.c MODULE_DEVICE_TABLE(of, stm_spi_match); · line 447

Quoted 3 lines
drivers/spi/spi-st-ssc4.c +0 -0
                .of_match_table = of_match_ptr(stm_spi_match),
        },
        .probe = spi_st_probe,

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
#5 lore raw

Le 28/07/2025 à 09:35, Geert Uytterhoeven a écrit :

Quoted 11 lines

Hi Raphael,

Quoted 5 lines · Raphael Gallais-Pou

Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards.

Thanks for your patch, which is now commit 7d61715c58a39edc ("spi:
rspi: Convert to DEFINE_SIMPLE_DEV_PM_OPS()") in spi/for-next.

Hi Geert,

Did you mean commit 6f8584a4826f ("spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()", 2025-06-09) ?

7d61715c58a39edc ("spi: rspi: Convert to DEFINE_SIMPLE_DEV_PM_OPS()") points to another reference, authored by you. :)>

Quoted 28 lines

drivers/spi/spi-st-ssc4.c static void spi_st_remove(struct platform_device *pdev) · line 381

Quoted 9 lines
drivers/spi/spi-st-ssc4.c +1 -2
@@ -378,8 +378,7 @@ static void spi_st_remove(struct platform_device *pdev)
         pinctrl_pm_select_sleep_state(&pdev->dev);
  }
 
-#ifdef CONFIG_PM
-static int spi_st_runtime_suspend(struct device *dev)
+static int __maybe_unused spi_st_runtime_suspend(struct device *dev)

The __maybe_unused can be removed, too...

drivers/spi/spi-st-ssc4.c static int spi_st_resume(struct device *dev) · line 431

Quoted 8 lines
drivers/spi/spi-st-ssc4.c +0 -1
@@ -429,7 +426,6 @@ static int spi_st_resume(struct device *dev)
 
         return pm_runtime_force_resume(dev);
  }
-#endif
 
  static const struct dev_pm_ops spi_st_pm = {
         SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)

... if you would update these, too:

     -    SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
     -    SET_RUNTIME_PM_OPS(spi_st_runtime_suspend, spi_st_runtime_resume, NULL)
     +    SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
     +    RUNTIME_PM_OPS(spi_st_runtime_suspend, spi_st_runtime_resume, NULL)
Quoted 9 lines

drivers/spi/spi-st-ssc4.c MODULE_DEVICE_TABLE(of, stm_spi_match); · line 444

Quoted 6 lines
drivers/spi/spi-st-ssc4.c +1 -1
@@ -445,7 +441,7 @@ MODULE_DEVICE_TABLE(of, stm_spi_match);
  static struct platform_driver spi_st_driver = {
         .driver = {
                 .name = "spi-st",
-               .pm = &spi_st_pm,
+               .pm = pm_sleep_ptr(&spi_st_pm),

This should use pm_ptr() instead, as spi_st_pm defines not only system sleep ops, but also Runtime PM ops.

Anyway, that is indeed a good catch. I actually got lost between CONFIG_PM and CONFIG_PM_SLEEP, which is now clarified.

I made a fix, but will send it after my summer break.

Thanks,

Best regards,
Raphaël>

Quoted 8 lines

drivers/spi/spi-st-ssc4.c MODULE_DEVICE_TABLE(of, stm_spi_match); · line 447

Quoted 3 lines
drivers/spi/spi-st-ssc4.c +0 -0
                 .of_match_table = of_match_ptr(stm_spi_match),
         },
         .probe = spi_st_probe,

Gr{oetje,eeting}s,

Geert

#6 lore raw

Hi Raphaël,

Quoted 6 lines · Raphaël Gallais-Pou
Quoted 5 lines · Geert Uytterhoeven
Quoted 4 lines · Raphael Gallais-Pou

Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Thanks for your patch, which is now commit 7d61715c58a39edc ("spi:
rspi: Convert to DEFINE_SIMPLE_DEV_PM_OPS()") in spi/for-next.

Did you mean commit 6f8584a4826f ("spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()", 2025-06-09) ?

Oops, you are right. Sorry for the confusion.

Quoted 41 lines

7d61715c58a39edc ("spi: rspi: Convert to DEFINE_SIMPLE_DEV_PM_OPS()") points to another reference, authored by you. :)>

Quoted 28 lines

drivers/spi/spi-st-ssc4.c static void spi_st_remove(struct platform_device *pdev) · line 381

Quoted 9 lines
drivers/spi/spi-st-ssc4.c +1 -2
@@ -378,8 +378,7 @@ static void spi_st_remove(struct platform_device *pdev)
         pinctrl_pm_select_sleep_state(&pdev->dev);
  }
 
-#ifdef CONFIG_PM
-static int spi_st_runtime_suspend(struct device *dev)
+static int __maybe_unused spi_st_runtime_suspend(struct device *dev)

The __maybe_unused can be removed, too...

drivers/spi/spi-st-ssc4.c static int spi_st_resume(struct device *dev) · line 431

Quoted 8 lines
drivers/spi/spi-st-ssc4.c +0 -1
@@ -429,7 +426,6 @@ static int spi_st_resume(struct device *dev)
 
         return pm_runtime_force_resume(dev);
  }
-#endif
 
  static const struct dev_pm_ops spi_st_pm = {
         SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)

... if you would update these, too:

     -    SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
     -    SET_RUNTIME_PM_OPS(spi_st_runtime_suspend, spi_st_runtime_resume, NULL)
     +    SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
     +    RUNTIME_PM_OPS(spi_st_runtime_suspend, spi_st_runtime_resume, NULL)
Quoted 9 lines

drivers/spi/spi-st-ssc4.c MODULE_DEVICE_TABLE(of, stm_spi_match); · line 444

Quoted 6 lines
drivers/spi/spi-st-ssc4.c +1 -1
@@ -445,7 +441,7 @@ MODULE_DEVICE_TABLE(of, stm_spi_match);
  static struct platform_driver spi_st_driver = {
         .driver = {
                 .name = "spi-st",
-               .pm = &spi_st_pm,
+               .pm = pm_sleep_ptr(&spi_st_pm),

This should use pm_ptr() instead, as spi_st_pm defines not only system sleep ops, but also Runtime PM ops.

Quoted 4 lines

Anyway, that is indeed a good catch. I actually got lost between CONFIG_PM and CONFIG_PM_SLEEP, which is now clarified.

I made a fix, but will send it after my summer break.

OK, looking forward to it!

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds