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

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.

Signed-off-by: default avatarRaphael Gallais-Pou <rgallaispou@gmail.com>
Link: https://patch.msgid.link/20250609-update_pm_macro-v1-1-819a53ef0eed@gmail.com


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

drivers/spi/spi-st-ssc4.c

+5 −9
Original line number Diff line number Diff line
@@ -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,