media: imx-mipi-csis: Switch to RUNTIME_PM_OPS()
Fabio Estevam
reviewerPATCH 1/2 media: imx-mipi-csis: Switch to RUNTIME_PM_OPS()
From: Fabio Estevam <[email protected]>
Replace SET_RUNTIME_PM_OPS() with its modern RUNTIME_PM_OPS() alternative.
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.
--- drivers/media/platform/nxp/imx-mipi-csis.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/media/platform/nxp/imx-mipi-csis.c +5 -5
@@ -1344,7 +1344,7 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis)* Suspend/resume */ -static int __maybe_unused mipi_csis_runtime_suspend (struct device *dev) +static int mipi_csis_runtime_suspend (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct mipi_csis_device *csis =sd_to_mipi_csis_device (sd);
@@ -1359,7 +1359,7 @@ static int __maybe_unused mipi_csis_runtime_suspend(struct device *dev)return 0 ; } -static int __maybe_unused mipi_csis_runtime_resume (struct device *dev) +static int mipi_csis_runtime_resume (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct mipi_csis_device *csis =sd_to_mipi_csis_device (sd);
@@ -1379,8 +1379,8 @@ static int __maybe_unused mipi_csis_runtime_resume(struct device *dev) }static const struct dev_pm_ops mipi_csis_pm_ops = { -SET_RUNTIME_PM_OPS (mipi_csis_runtime_suspend, mipi_csis_runtime_resume, -NULL ) +RUNTIME_PM_OPS (mipi_csis_runtime_suspend, mipi_csis_runtime_resume, +NULL ) };/* -----------------------------------------------------------------------------
@@ -1571,7 +1571,7 @@ static struct platform_driver mipi_csis_driver = { .driver = { .of_match_table = mipi_csis_of_match, .name = CSIS_DRIVER_NAME, - .pm = &mipi_csis_pm_ops, + .pm = pm_ptr(&mipi_csis_pm_ops), }, };
Signature · 1 line
2.34.1
Fabio Estevam
reviewerPATCH 2/2 media: imx8mq-mipi-csi2: 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 __maybe_unused notation from the runtime suspend/resume() functions..
--- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/media/platform/nxp/imx8mq-mipi-csi2.c +8 -9
@@ -693,7 +693,7 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev)return ret ? -EAGAIN :0 ; } -static int __maybe_unused imx8mq_mipi_csi_suspend (struct device *dev) +static int imx8mq_mipi_csi_suspend (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);
@@ -705,7 +705,7 @@ static int __maybe_unused imx8mq_mipi_csi_suspend(struct device *dev)return 0 ; } -static int __maybe_unused imx8mq_mipi_csi_resume (struct device *dev) +static int imx8mq_mipi_csi_resume (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);
@@ -716,7 +716,7 @@ static int __maybe_unused imx8mq_mipi_csi_resume(struct device *dev)return imx8mq_mipi_csi_pm_resume (dev); } -static int __maybe_unused imx8mq_mipi_csi_runtime_suspend (struct device *dev) +static int imx8mq_mipi_csi_runtime_suspend (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);
@@ -731,7 +731,7 @@ static int __maybe_unused imx8mq_mipi_csi_runtime_suspend(struct device *dev)return ret; } -static int __maybe_unused imx8mq_mipi_csi_runtime_resume (struct device *dev) +static int imx8mq_mipi_csi_runtime_resume (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);
@@ -747,10 +747,9 @@ static int __maybe_unused imx8mq_mipi_csi_runtime_resume(struct device *dev) }static const struct dev_pm_ops imx8mq_mipi_csi_pm_ops = { - SET_RUNTIME_PM_OPS(imx8mq_mipi_csi_runtime_suspend, - imx8mq_mipi_csi_runtime_resume, - NULL) -SET_SYSTEM_SLEEP_PM_OPS (imx8mq_mipi_csi_suspend, imx8mq_mipi_csi_resume) + RUNTIME_PM_OPS(imx8mq_mipi_csi_runtime_suspend, + imx8mq_mipi_csi_runtime_resume, NULL) +SYSTEM_SLEEP_PM_OPS (imx8mq_mipi_csi_suspend, imx8mq_mipi_csi_resume) };/* -----------------------------------------------------------------------------
@@ -958,7 +957,7 @@ static struct platform_driver imx8mq_mipi_csi_driver = { .driver = { .of_match_table = imx8mq_mipi_csi_of_match, .name = MIPI_CSI2_DRIVER_NAME, - .pm = &imx8mq_mipi_csi_pm_ops, + .pm = pm_ptr(&imx8mq_mipi_csi_pm_ops), }, };
Signature · 1 line
2.34.1
Re: [PATCH 2/2] media: imx8mq-mipi-csi2: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS()
Hi Fabio,
Thank you for the patch.
Quoted 5 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Replace SET_RUNTIME_PM_OPS()/SET
SYSTEM_SLEEP_PM_OPS()with their modernRUNTIME_PM_OPS()andSYSTEM_SLEEP_PM_OPS()alternatives.
Quoted 8 lines
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_unusednotation from the runtime suspend/resume() functions..Signed-off-by Fabio Estevam <[email protected]>
Quoted 67 lines
--- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)drivers/media/platform/nxp/imx8mq-mipi-csi2.c +8
-9@@ -693,7 +693,7 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev)return ret ? -EAGAIN :0 ; } -static int __maybe_unused imx8mq_mipi_csi_suspend (struct device *dev) +static int imx8mq_mipi_csi_suspend (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);@@ -705,7 +705,7 @@ static int __maybe_unused imx8mq_mipi_csi_suspend(struct device *dev)return 0 ; } -static int __maybe_unused imx8mq_mipi_csi_resume (struct device *dev) +static int imx8mq_mipi_csi_resume (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);@@ -716,7 +716,7 @@ static int __maybe_unused imx8mq_mipi_csi_resume(struct device *dev)return imx8mq_mipi_csi_pm_resume (dev); } -static int __maybe_unused imx8mq_mipi_csi_runtime_suspend (struct device *dev) +static int imx8mq_mipi_csi_runtime_suspend (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);@@ -731,7 +731,7 @@ static int __maybe_unused imx8mq_mipi_csi_runtime_suspend(struct device *dev)return ret; } -static int __maybe_unused imx8mq_mipi_csi_runtime_resume (struct device *dev) +static int imx8mq_mipi_csi_runtime_resume (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct csi_state *state =mipi_sd_to_csi2_state (sd);@@ -747,10 +747,9 @@ static int __maybe_unused imx8mq_mipi_csi_runtime_resume(struct device *dev) }static const struct dev_pm_ops imx8mq_mipi_csi_pm_ops = { - SET_RUNTIME_PM_OPS(imx8mq_mipi_csi_runtime_suspend, - imx8mq_mipi_csi_runtime_resume, - NULL) -SET_SYSTEM_SLEEP_PM_OPS (imx8mq_mipi_csi_suspend, imx8mq_mipi_csi_resume) + RUNTIME_PM_OPS(imx8mq_mipi_csi_runtime_suspend, + imx8mq_mipi_csi_runtime_resume, NULL) +SYSTEM_SLEEP_PM_OPS (imx8mq_mipi_csi_suspend, imx8mq_mipi_csi_resume) };/* ----------------------------------------------------------------------------- @@ -958,7 +957,7 @@ static struct platform_driver imx8mq_mipi_csi_driver = { .driver = { .of_match_table = imx8mq_mipi_csi_of_match, .name = MIPI_CSI2_DRIVER_NAME, - .pm = &imx8mq_mipi_csi_pm_ops, + .pm = pm_ptr(&imx8mq_mipi_csi_pm_ops), }, };
Signature · 3 lines
Regards, Laurent Pinchart
Hi Fabio,
Thank you for the patch.
Quoted 5 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Replace
SET_RUNTIME_PM_OPS()with its modernRUNTIME_PM_OPS()alternative.
Quoted 8 lines
The combined usage of
pm_ptr()andRUNTIME_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_unusednotation from the runtime suspend/resume() functions.Signed-off-by Fabio Estevam <[email protected]>
Quoted 46 lines
--- drivers/media/platform/nxp/imx-mipi-csis.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/media/platform/nxp/imx-mipi-csis.c +5
-5@@ -1344,7 +1344,7 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis)* Suspend/resume */ -static int __maybe_unused mipi_csis_runtime_suspend (struct device *dev) +static int mipi_csis_runtime_suspend (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct mipi_csis_device *csis =sd_to_mipi_csis_device (sd);@@ -1359,7 +1359,7 @@ static int __maybe_unused mipi_csis_runtime_suspend(struct device *dev)return 0 ; } -static int __maybe_unused mipi_csis_runtime_resume (struct device *dev) +static int mipi_csis_runtime_resume (struct device *dev) {struct v4l2_subdev *sd =dev_get_drvdata (dev);struct mipi_csis_device *csis =sd_to_mipi_csis_device (sd);@@ -1379,8 +1379,8 @@ static int __maybe_unused mipi_csis_runtime_resume(struct device *dev) }static const struct dev_pm_ops mipi_csis_pm_ops = { -SET_RUNTIME_PM_OPS (mipi_csis_runtime_suspend, mipi_csis_runtime_resume, -NULL ) +RUNTIME_PM_OPS (mipi_csis_runtime_suspend, mipi_csis_runtime_resume, +NULL ) };/* ----------------------------------------------------------------------------- @@ -1571,7 +1571,7 @@ static struct platform_driver mipi_csis_driver = { .driver = { .of_match_table = mipi_csis_of_match, .name = CSIS_DRIVER_NAME, - .pm = &mipi_csis_pm_ops, + .pm = pm_ptr(&mipi_csis_pm_ops), }, };
Signature · 3 lines
Regards, Laurent Pinchart