| Message ID | 20240130164115.116613-2-biju.das.jz@bp.renesas.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | RZ/G2L CSI/CRU improvements | expand |
Hi Biju, Thank you for the patch. On Tue, Jan 30, 2024 at 04:41:12PM +0000, Biju Das wrote: > Replace the old SET_RUNTIME_PM_OPS() helpers with its modern alternative > RUNTIME_PM_OPS(). The usage of pm_ptr and RUNTIME_PM_OPS() allows the > compiler to see where it's used but still drop the dead code. After this > we can get rid of the unnecessary '__maybe_unused' annotations on PM > functions. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > v1->v2: > * Updated commit description. > * Aligned RUNTIME_PM_OPS() macro. > --- > drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c > index d20f4eff93a4..e00d9379dd2c 100644 > --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c > +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c > @@ -834,7 +834,7 @@ static void rzg2l_csi2_remove(struct platform_device *pdev) > pm_runtime_disable(&pdev->dev); > } > > -static int __maybe_unused rzg2l_csi2_pm_runtime_suspend(struct device *dev) > +static int rzg2l_csi2_pm_runtime_suspend(struct device *dev) > { > struct rzg2l_csi2 *csi2 = dev_get_drvdata(dev); > > @@ -843,7 +843,7 @@ static int __maybe_unused rzg2l_csi2_pm_runtime_suspend(struct device *dev) > return 0; > } > > -static int __maybe_unused rzg2l_csi2_pm_runtime_resume(struct device *dev) > +static int rzg2l_csi2_pm_runtime_resume(struct device *dev) > { > struct rzg2l_csi2 *csi2 = dev_get_drvdata(dev); > > @@ -851,7 +851,8 @@ static int __maybe_unused rzg2l_csi2_pm_runtime_resume(struct device *dev) > } > > static const struct dev_pm_ops rzg2l_csi2_pm_ops = { > - SET_RUNTIME_PM_OPS(rzg2l_csi2_pm_runtime_suspend, rzg2l_csi2_pm_runtime_resume, NULL) > + RUNTIME_PM_OPS(rzg2l_csi2_pm_runtime_suspend, > + rzg2l_csi2_pm_runtime_resume, NULL) > }; > > static const struct of_device_id rzg2l_csi2_of_table[] = { > @@ -865,7 +866,7 @@ static struct platform_driver rzg2l_csi2_pdrv = { > .driver = { > .name = "rzg2l-csi2", > .of_match_table = rzg2l_csi2_of_table, > - .pm = &rzg2l_csi2_pm_ops, > + .pm = pm_ptr(&rzg2l_csi2_pm_ops), > }, > }; >
diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c index d20f4eff93a4..e00d9379dd2c 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c @@ -834,7 +834,7 @@ static void rzg2l_csi2_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); } -static int __maybe_unused rzg2l_csi2_pm_runtime_suspend(struct device *dev) +static int rzg2l_csi2_pm_runtime_suspend(struct device *dev) { struct rzg2l_csi2 *csi2 = dev_get_drvdata(dev); @@ -843,7 +843,7 @@ static int __maybe_unused rzg2l_csi2_pm_runtime_suspend(struct device *dev) return 0; } -static int __maybe_unused rzg2l_csi2_pm_runtime_resume(struct device *dev) +static int rzg2l_csi2_pm_runtime_resume(struct device *dev) { struct rzg2l_csi2 *csi2 = dev_get_drvdata(dev); @@ -851,7 +851,8 @@ static int __maybe_unused rzg2l_csi2_pm_runtime_resume(struct device *dev) } static const struct dev_pm_ops rzg2l_csi2_pm_ops = { - SET_RUNTIME_PM_OPS(rzg2l_csi2_pm_runtime_suspend, rzg2l_csi2_pm_runtime_resume, NULL) + RUNTIME_PM_OPS(rzg2l_csi2_pm_runtime_suspend, + rzg2l_csi2_pm_runtime_resume, NULL) }; static const struct of_device_id rzg2l_csi2_of_table[] = { @@ -865,7 +866,7 @@ static struct platform_driver rzg2l_csi2_pdrv = { .driver = { .name = "rzg2l-csi2", .of_match_table = rzg2l_csi2_of_table, - .pm = &rzg2l_csi2_pm_ops, + .pm = pm_ptr(&rzg2l_csi2_pm_ops), }, };
Replace the old SET_RUNTIME_PM_OPS() helpers with its modern alternative RUNTIME_PM_OPS(). The usage of pm_ptr and RUNTIME_PM_OPS() allows the compiler to see where it's used but still drop the dead code. After this we can get rid of the unnecessary '__maybe_unused' annotations on PM functions. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- v1->v2: * Updated commit description. * Aligned RUNTIME_PM_OPS() macro. --- drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)