diff mbox series

[v2,17/26] drm: rcar-du: Remove #ifdef guards for PM related functions

Message ID 20221129191942.138244-4-paul@crapouillou.net (mailing list archive)
State Mainlined
Commit c3ad24aca3f7e602fa35978f5d9651d2e8a5fe88
Delegated to: Kieran Bingham
Headers show
Series None | expand

Commit Message

Paul Cercueil Nov. 29, 2022, 7:19 p.m. UTC
Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to handle
the .suspend/.resume callbacks.

These macros allow the suspend and resume functions to be automatically
dropped by the compiler when CONFIG_SUSPEND is disabled, without having
to use #ifdef guards.

This has the advantage of always compiling these functions in,
independently of any Kconfig option. Thanks to that, bugs and other
regressions are subsequently easier to catch.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
---
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: linux-renesas-soc@vger.kernel.org
---
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Laurent Pinchart Nov. 29, 2022, 7:43 p.m. UTC | #1
Hi Paul,

Thank you for the patch.

On Tue, Nov 29, 2022 at 07:19:33PM +0000, Paul Cercueil wrote:
> Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to handle
> the .suspend/.resume callbacks.
> 
> These macros allow the suspend and resume functions to be automatically
> dropped by the compiler when CONFIG_SUSPEND is disabled, without having
> to use #ifdef guards.
> 
> This has the advantage of always compiling these functions in,
> independently of any Kconfig option. Thanks to that, bugs and other
> regressions are subsequently easier to catch.
> 
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Will you get this whole series merged in one go in drm-misc, or do you
expect me to take this patch in my tree ? I'd prefer the first option if
possible (less work for me :-)).

> ---
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> Cc: linux-renesas-soc@vger.kernel.org
> ---
>  drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> index d003e8d9e7a2..eeec1e02446f 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> @@ -599,7 +599,6 @@ static const struct drm_driver rcar_du_driver = {
>   * Power management
>   */
>  
> -#ifdef CONFIG_PM_SLEEP
>  static int rcar_du_pm_suspend(struct device *dev)
>  {
>  	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
> @@ -613,11 +612,9 @@ static int rcar_du_pm_resume(struct device *dev)
>  
>  	return drm_mode_config_helper_resume(&rcdu->ddev);
>  }
> -#endif
>  
> -static const struct dev_pm_ops rcar_du_pm_ops = {
> -	SET_SYSTEM_SLEEP_PM_OPS(rcar_du_pm_suspend, rcar_du_pm_resume)
> -};
> +static DEFINE_SIMPLE_DEV_PM_OPS(rcar_du_pm_ops,
> +				rcar_du_pm_suspend, rcar_du_pm_resume);
>  
>  /* -----------------------------------------------------------------------------
>   * Platform driver
> @@ -712,7 +709,7 @@ static struct platform_driver rcar_du_platform_driver = {
>  	.shutdown	= rcar_du_shutdown,
>  	.driver		= {
>  		.name	= "rcar-du",
> -		.pm	= &rcar_du_pm_ops,
> +		.pm	= pm_sleep_ptr(&rcar_du_pm_ops),
>  		.of_match_table = rcar_du_of_table,
>  	},
>  };
Paul Cercueil Nov. 29, 2022, 9:05 p.m. UTC | #2
Hi Laurent,

Le mardi 29 novembre 2022 à 21:43 +0200, Laurent Pinchart a écrit :
> Hi Paul,
> 
> Thank you for the patch.
> 
> On Tue, Nov 29, 2022 at 07:19:33PM +0000, Paul Cercueil wrote:
> > Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to
> > handle
> > the .suspend/.resume callbacks.
> > 
> > These macros allow the suspend and resume functions to be
> > automatically
> > dropped by the compiler when CONFIG_SUSPEND is disabled, without
> > having
> > to use #ifdef guards.
> > 
> > This has the advantage of always compiling these functions in,
> > independently of any Kconfig option. Thanks to that, bugs and other
> > regressions are subsequently easier to catch.
> > 
> > Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> > Reviewed-by: Kieran Bingham
> > <kieran.bingham+renesas@ideasonboard.com>
> 
> Reviewed-by: Laurent Pinchart
> <laurent.pinchart+renesas@ideasonboard.com>
> 
> Will you get this whole series merged in one go in drm-misc, or do
> you
> expect me to take this patch in my tree ? I'd prefer the first option
> if
> possible (less work for me :-)).

I actually answered that in my cover letter ;)

However I assumed it had to go through drm-next, if you think it can go
through drm-misc-next, I can apply it myself.

Cheers,
-Paul

> 
> > ---
> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> > Cc: linux-renesas-soc@vger.kernel.org
> > ---
> >  drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +++------
> >  1 file changed, 3 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > index d003e8d9e7a2..eeec1e02446f 100644
> > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > @@ -599,7 +599,6 @@ static const struct drm_driver rcar_du_driver =
> > {
> >   * Power management
> >   */
> >  
> > -#ifdef CONFIG_PM_SLEEP
> >  static int rcar_du_pm_suspend(struct device *dev)
> >  {
> >         struct rcar_du_device *rcdu = dev_get_drvdata(dev);
> > @@ -613,11 +612,9 @@ static int rcar_du_pm_resume(struct device
> > *dev)
> >  
> >         return drm_mode_config_helper_resume(&rcdu->ddev);
> >  }
> > -#endif
> >  
> > -static const struct dev_pm_ops rcar_du_pm_ops = {
> > -       SET_SYSTEM_SLEEP_PM_OPS(rcar_du_pm_suspend,
> > rcar_du_pm_resume)
> > -};
> > +static DEFINE_SIMPLE_DEV_PM_OPS(rcar_du_pm_ops,
> > +                               rcar_du_pm_suspend,
> > rcar_du_pm_resume);
> >  
> >  /* ---------------------------------------------------------------
> > --------------
> >   * Platform driver
> > @@ -712,7 +709,7 @@ static struct platform_driver
> > rcar_du_platform_driver = {
> >         .shutdown       = rcar_du_shutdown,
> >         .driver         = {
> >                 .name   = "rcar-du",
> > -               .pm     = &rcar_du_pm_ops,
> > +               .pm     = pm_sleep_ptr(&rcar_du_pm_ops),
> >                 .of_match_table = rcar_du_of_table,
> >         },
> >  };
>
Laurent Pinchart Nov. 29, 2022, 9:24 p.m. UTC | #3
Hi Paul,

On Tue, Nov 29, 2022 at 09:05:49PM +0000, Paul Cercueil wrote:
> Le mardi 29 novembre 2022 à 21:43 +0200, Laurent Pinchart a écrit :
> > On Tue, Nov 29, 2022 at 07:19:33PM +0000, Paul Cercueil wrote:
> > > Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to handle
> > > the .suspend/.resume callbacks.
> > > 
> > > These macros allow the suspend and resume functions to be automatically
> > > dropped by the compiler when CONFIG_SUSPEND is disabled, without having
> > > to use #ifdef guards.
> > > 
> > > This has the advantage of always compiling these functions in,
> > > independently of any Kconfig option. Thanks to that, bugs and other
> > > regressions are subsequently easier to catch.
> > > 
> > > Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> > > Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> > 
> > Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > Will you get this whole series merged in one go in drm-misc, or do you
> > expect me to take this patch in my tree ? I'd prefer the first option if
> > possible (less work for me :-)).
> 
> I actually answered that in my cover letter ;)

Oops. I read until "V2" and didn't notice the last paragraph, sorry.

> However I assumed it had to go through drm-next, if you think it can go
> through drm-misc-next, I can apply it myself.

This seems like a good candidate for drm-misc to me.

> > > ---
> > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> > > Cc: linux-renesas-soc@vger.kernel.org
> > > ---
> > >  drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +++------
> > >  1 file changed, 3 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > > b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > > index d003e8d9e7a2..eeec1e02446f 100644
> > > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > > @@ -599,7 +599,6 @@ static const struct drm_driver rcar_du_driver =
> > > {
> > >   * Power management
> > >   */
> > >  
> > > -#ifdef CONFIG_PM_SLEEP
> > >  static int rcar_du_pm_suspend(struct device *dev)
> > >  {
> > >         struct rcar_du_device *rcdu = dev_get_drvdata(dev);
> > > @@ -613,11 +612,9 @@ static int rcar_du_pm_resume(struct device
> > > *dev)
> > >  
> > >         return drm_mode_config_helper_resume(&rcdu->ddev);
> > >  }
> > > -#endif
> > >  
> > > -static const struct dev_pm_ops rcar_du_pm_ops = {
> > > -       SET_SYSTEM_SLEEP_PM_OPS(rcar_du_pm_suspend,
> > > rcar_du_pm_resume)
> > > -};
> > > +static DEFINE_SIMPLE_DEV_PM_OPS(rcar_du_pm_ops,
> > > +                               rcar_du_pm_suspend,
> > > rcar_du_pm_resume);
> > >  
> > >  /* ---------------------------------------------------------------
> > > --------------
> > >   * Platform driver
> > > @@ -712,7 +709,7 @@ static struct platform_driver
> > > rcar_du_platform_driver = {
> > >         .shutdown       = rcar_du_shutdown,
> > >         .driver         = {
> > >                 .name   = "rcar-du",
> > > -               .pm     = &rcar_du_pm_ops,
> > > +               .pm     = pm_sleep_ptr(&rcar_du_pm_ops),
> > >                 .of_match_table = rcar_du_of_table,
> > >         },
> > >  };
diff mbox series

Patch

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index d003e8d9e7a2..eeec1e02446f 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -599,7 +599,6 @@  static const struct drm_driver rcar_du_driver = {
  * Power management
  */
 
-#ifdef CONFIG_PM_SLEEP
 static int rcar_du_pm_suspend(struct device *dev)
 {
 	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
@@ -613,11 +612,9 @@  static int rcar_du_pm_resume(struct device *dev)
 
 	return drm_mode_config_helper_resume(&rcdu->ddev);
 }
-#endif
 
-static const struct dev_pm_ops rcar_du_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(rcar_du_pm_suspend, rcar_du_pm_resume)
-};
+static DEFINE_SIMPLE_DEV_PM_OPS(rcar_du_pm_ops,
+				rcar_du_pm_suspend, rcar_du_pm_resume);
 
 /* -----------------------------------------------------------------------------
  * Platform driver
@@ -712,7 +709,7 @@  static struct platform_driver rcar_du_platform_driver = {
 	.shutdown	= rcar_du_shutdown,
 	.driver		= {
 		.name	= "rcar-du",
-		.pm	= &rcar_du_pm_ops,
+		.pm	= pm_sleep_ptr(&rcar_du_pm_ops),
 		.of_match_table = rcar_du_of_table,
 	},
 };