Skip to content

Commit a93f089

Browse files
Fabio Estevambroonie
authored andcommitted
spi: spi-imx: Switch to RUNTIME_PM_OPS/SYSTEM_SLEEP_PM_OPS()
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. Signed-off-by: Fabio Estevam <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 1743600 commit a93f089

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

drivers/spi/spi-imx.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,7 @@ static void spi_imx_remove(struct platform_device *pdev)
18981898
spi_imx_sdma_exit(spi_imx);
18991899
}
19001900

1901-
static int __maybe_unused spi_imx_runtime_resume(struct device *dev)
1901+
static int spi_imx_runtime_resume(struct device *dev)
19021902
{
19031903
struct spi_controller *controller = dev_get_drvdata(dev);
19041904
struct spi_imx_data *spi_imx;
@@ -1919,7 +1919,7 @@ static int __maybe_unused spi_imx_runtime_resume(struct device *dev)
19191919
return 0;
19201920
}
19211921

1922-
static int __maybe_unused spi_imx_runtime_suspend(struct device *dev)
1922+
static int spi_imx_runtime_suspend(struct device *dev)
19231923
{
19241924
struct spi_controller *controller = dev_get_drvdata(dev);
19251925
struct spi_imx_data *spi_imx;
@@ -1932,22 +1932,21 @@ static int __maybe_unused spi_imx_runtime_suspend(struct device *dev)
19321932
return 0;
19331933
}
19341934

1935-
static int __maybe_unused spi_imx_suspend(struct device *dev)
1935+
static int spi_imx_suspend(struct device *dev)
19361936
{
19371937
pinctrl_pm_select_sleep_state(dev);
19381938
return 0;
19391939
}
19401940

1941-
static int __maybe_unused spi_imx_resume(struct device *dev)
1941+
static int spi_imx_resume(struct device *dev)
19421942
{
19431943
pinctrl_pm_select_default_state(dev);
19441944
return 0;
19451945
}
19461946

19471947
static const struct dev_pm_ops imx_spi_pm = {
1948-
SET_RUNTIME_PM_OPS(spi_imx_runtime_suspend,
1949-
spi_imx_runtime_resume, NULL)
1950-
SET_SYSTEM_SLEEP_PM_OPS(spi_imx_suspend, spi_imx_resume)
1948+
RUNTIME_PM_OPS(spi_imx_runtime_suspend, spi_imx_runtime_resume, NULL)
1949+
SYSTEM_SLEEP_PM_OPS(spi_imx_suspend, spi_imx_resume)
19511950
};
19521951

19531952
static struct platform_driver spi_imx_driver = {

0 commit comments

Comments
 (0)