On Wed, May 8, 2024 at 1:37 AM Fabio Estevam <festevam@xxxxxxxxx> wrote:
>
> From: Fabio Estevam <festevam@xxxxxxx>
>
> Replace SET_RUNTIME_PM_OPS() with its modern alternative RUNTIME_PM_OPS().
>
> The combined usage of pm_ptr() and RUNTIME_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 <festevam@xxxxxxx>
Acked-by: Shengjiu Wang <shengjiu.wang@xxxxxxxxx>
Best regards
Shengjiu Wang
> ---
> sound/soc/fsl/fsl_aud2htx.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_aud2htx.c b/sound/soc/fsl/fsl_aud2htx.c
> index ee2f6ad1f800..a6cbaa6364c7 100644
> --- a/sound/soc/fsl/fsl_aud2htx.c
> +++ b/sound/soc/fsl/fsl_aud2htx.c
> @@ -261,7 +261,7 @@ static void fsl_aud2htx_remove(struct platform_device *pdev)
> pm_runtime_disable(&pdev->dev);
> }
>
> -static int __maybe_unused fsl_aud2htx_runtime_suspend(struct device *dev)
> +static int fsl_aud2htx_runtime_suspend(struct device *dev)
> {
> struct fsl_aud2htx *aud2htx = dev_get_drvdata(dev);
>
> @@ -271,7 +271,7 @@ static int __maybe_unused fsl_aud2htx_runtime_suspend(struct device *dev)
> return 0;
> }
>
> -static int __maybe_unused fsl_aud2htx_runtime_resume(struct device *dev)
> +static int fsl_aud2htx_runtime_resume(struct device *dev)
> {
> struct fsl_aud2htx *aud2htx = dev_get_drvdata(dev);
> int ret;
> @@ -288,9 +288,8 @@ static int __maybe_unused fsl_aud2htx_runtime_resume(struct device *dev)
> }
>
> static const struct dev_pm_ops fsl_aud2htx_pm_ops = {
> - SET_RUNTIME_PM_OPS(fsl_aud2htx_runtime_suspend,
> - fsl_aud2htx_runtime_resume,
> - NULL)
> + RUNTIME_PM_OPS(fsl_aud2htx_runtime_suspend, fsl_aud2htx_runtime_resume,
> + NULL)
> SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> pm_runtime_force_resume)
> };
> @@ -300,7 +299,7 @@ static struct platform_driver fsl_aud2htx_driver = {
> .remove_new = fsl_aud2htx_remove,
> .driver = {
> .name = "fsl-aud2htx",
> - .pm = &fsl_aud2htx_pm_ops,
> + .pm = pm_ptr(&fsl_aud2htx_pm_ops),
> .of_match_table = fsl_aud2htx_dt_ids,
> },
> };
> --
> 2.34.1
>
