Unverified Commit 5dfd8f78 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

ASoC: fsl: fsl_xcvr: Switch to RUNTIME_PM_OPS() 



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: default avatarFabio Estevam <festevam@denx.de>
Link: https://msgid.link/r/20240507173735.3456334-3-festevam@gmail.com


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

sound/soc/fsl/fsl_xcvr.c

+4 −6
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ static void fsl_xcvr_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

}



static __maybe_unused int fsl_xcvr_runtime_suspend(struct device *dev)

static int fsl_xcvr_runtime_suspend(struct device *dev)

{

	struct fsl_xcvr *xcvr = dev_get_drvdata(dev);

	int ret;
@@ -1398,7 +1398,7 @@ static __maybe_unused int fsl_xcvr_runtime_suspend(struct device *dev) 
	return 0;

}



static __maybe_unused int fsl_xcvr_runtime_resume(struct device *dev)

static int fsl_xcvr_runtime_resume(struct device *dev)

{

	struct fsl_xcvr *xcvr = dev_get_drvdata(dev);

	int ret;
@@ -1483,9 +1483,7 @@ static __maybe_unused int fsl_xcvr_runtime_resume(struct device *dev) 
}



static const struct dev_pm_ops fsl_xcvr_pm_ops = {

	SET_RUNTIME_PM_OPS(fsl_xcvr_runtime_suspend,

			   fsl_xcvr_runtime_resume,

			   NULL)

	RUNTIME_PM_OPS(fsl_xcvr_runtime_suspend, fsl_xcvr_runtime_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

};
@@ -1494,7 +1492,7 @@ static struct platform_driver fsl_xcvr_driver = { 
	.probe = fsl_xcvr_probe,

	.driver = {

		.name = "fsl,imx8mp-audio-xcvr",

		.pm = &fsl_xcvr_pm_ops,

		.pm = pm_ptr(&fsl_xcvr_pm_ops),

		.of_match_table = fsl_xcvr_dt_ids,

	},

	.remove_new = fsl_xcvr_remove,