Unverified Commit 7c7cda81 authored by Raphael Gallais-Pou's avatar Raphael Gallais-Pou Committed by Mark Brown
Browse files

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: 6f8584a4 ("spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()")

Signed-off-by: default avatarRaphael Gallais-Pou <rgallaispou@gmail.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/20250820180310.9605-1-rgallaispou@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 13d0fe84

drivers/spi/spi-st-ssc4.c

+5 −5
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static void spi_st_remove(struct platform_device *pdev) 
	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_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;

}



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_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 = {

	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)

};



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 = {

	.driver = {

		.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),

	},

	.probe = spi_st_probe,