OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

remoteproc: imx_dsp_rproc: use modern pm_ops 

Without CONFIG_PM, the driver warns about unused functions:

drivers/remoteproc/imx_dsp_rproc.c:1210:12: error: 'imx_dsp_runtime_suspend' defined but not used [-Werror=unused-function]
 1210 | static int imx_dsp_runtime_suspend(struct device *dev)
      |            ^~~~~~~~~~~~~~~~~~~~~~~
drivers/remoteproc/imx_dsp_rproc.c:1178:12: error: 'imx_dsp_runtime_resume' defined but not used [-Werror=unused-function]
 1178 | static int imx_dsp_runtime_resume(struct device *dev)
      |            ^~~~~~~~~~~~~~~~~~~~~~

Change the old SET_SYSTEM_SLEEP_PM_OPS()/SET_RUNTIME_PM_OPS()
helpers to their modern replacements that avoid the warning,
and remove the now unnecessary __maybe_unused annotations
on the other PM helper functions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Link: https://lore.kernel.org/r/20230420213610.2219080-1-arnd@kernel.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
This commit is contained in:
Arnd Bergmann 2023-04-20 23:36:04 +02:00 committed by Mathieu Poirier
parent 52ca331bb7
commit 47f64e7ef9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/remoteproc/imx_dsp_rproc.c
View File

@ -1241,7 +1241,7 @@ static void imx_dsp_load_firmware(const struct firmware *fw, void *context)
release_firmware(fw);
}
static __maybe_unused int imx_dsp_suspend(struct device *dev)
static int imx_dsp_suspend(struct device *dev)
{
struct rproc *rproc = dev_get_drvdata(dev);
struct imx_dsp_rproc *priv = rproc->priv;
@ -1276,7 +1276,7 @@ static __maybe_unused int imx_dsp_suspend(struct device *dev)
return pm_runtime_force_suspend(dev);
}
static __maybe_unused int imx_dsp_resume(struct device *dev)
static int imx_dsp_resume(struct device *dev)
{
struct rproc *rproc = dev_get_drvdata(dev);
int ret = 0;
@ -1310,9 +1310,8 @@ static __maybe_unused int imx_dsp_resume(struct device *dev)
}
static const struct dev_pm_ops imx_dsp_rproc_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(imx_dsp_suspend, imx_dsp_resume)
SET_RUNTIME_PM_OPS(imx_dsp_runtime_suspend,
imx_dsp_runtime_resume, NULL)
SYSTEM_SLEEP_PM_OPS(imx_dsp_suspend, imx_dsp_resume)
RUNTIME_PM_OPS(imx_dsp_runtime_suspend, imx_dsp_runtime_resume, NULL)
};
static const struct of_device_id imx_dsp_rproc_of_match[] = {
@ -1330,7 +1329,7 @@ static struct platform_driver imx_dsp_rproc_driver = {
.driver = {
.name = "imx-dsp-rproc",
.of_match_table = imx_dsp_rproc_of_match,
.pm = &imx_dsp_rproc_pm_ops,
.pm = pm_ptr(&imx_dsp_rproc_pm_ops),
},
};
module_platform_driver(imx_dsp_rproc_driver);