media: imx-jpeg: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS()
Fabio Estevam
reviewerPATCH 1/1 media: imx-jpeg: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS()
From: Fabio Estevam <[email protected]>
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 CONFIG_PM ifdefery from the runtime suspend/resume() functions.
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +3 -8
@@ -2888,7 +2888,6 @@ static int mxc_jpeg_probe(struct platform_device *pdev)return ret; } -#ifdef CONFIG_PM static int mxc_jpeg_runtime_resume (struct device *dev) {struct mxc_jpeg_dev *jpeg =dev_get_drvdata (dev);
@@ -2911,9 +2910,7 @@ static int mxc_jpeg_runtime_suspend(struct device *dev)return 0 ; } -#endif -#ifdef CONFIG_PM_SLEEP static int mxc_jpeg_suspend (struct device *dev) {struct mxc_jpeg_dev *jpeg =dev_get_drvdata (dev);
@@ -2934,12 +2931,10 @@ static int mxc_jpeg_resume(struct device *dev)v4l2_m2m_resume (jpeg->m2m_dev);return ret; } -#endif static const struct dev_pm_ops mxc_jpeg_pm_ops = { - SET_RUNTIME_PM_OPS(mxc_jpeg_runtime_suspend, - mxc_jpeg_runtime_resume, NULL) -SET_SYSTEM_SLEEP_PM_OPS (mxc_jpeg_suspend, mxc_jpeg_resume) + RUNTIME_PM_OPS(mxc_jpeg_runtime_suspend, mxc_jpeg_runtime_resume, NULL) +SYSTEM_SLEEP_PM_OPS (mxc_jpeg_suspend, mxc_jpeg_resume) };static void mxc_jpeg_remove (struct platform_device *pdev)
@@ -2963,7 +2958,7 @@ static struct platform_driver mxc_jpeg_driver = { .driver = { .name = "mxc-jpeg", .of_match_table = mxc_jpeg_match, - .pm = &mxc_jpeg_pm_ops, + .pm = pm_ptr(&mxc_jpeg_pm_ops), }, };module_platform_driver (mxc_jpeg_driver);
Signature · 1 line
2.34.1