[PATCH 21/26] drm: tilcdc: Remove #ifdef guards for PM related functions

[sarha at kapsi.fi]

November 7, 2022 at 7:52 PM, "Paul Cercueil" <paul at crapouillou.net mailto:paul at crapouillou.net?to=%22Paul%20Cercueil%22%20%3Cpaul%40crapouillou.net%3E > 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 at crapouillou.net>

Acked-by: Jyri Sarha <jyri.sarhaı@iki.fi>

> ---
> Cc: Jyri Sarha <jyri.sarha at iki.fi>
> Cc: Tomi Valkeinen <tomba at kernel.org>
> ---
> drivers/gpu/drm/tilcdc/tilcdc_drv.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
> index f72755b8ea14..cd5bdc2f803a 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
> @@ -496,7 +496,6 @@ static const struct drm_driver tilcdc_driver = {
> * Power management:
> */
> 
> -#ifdef CONFIG_PM_SLEEP
> static int tilcdc_pm_suspend(struct device *dev)
> {
>  struct drm_device *ddev = dev_get_drvdata(dev);
> @@ -518,11 +517,9 @@ static int tilcdc_pm_resume(struct device *dev)
>  pinctrl_pm_select_default_state(dev);
>  return drm_mode_config_helper_resume(ddev);
> }
> -#endif
> 
> -static const struct dev_pm_ops tilcdc_pm_ops = {
> - SET_SYSTEM_SLEEP_PM_OPS(tilcdc_pm_suspend, tilcdc_pm_resume)
> -};
> +static DEFINE_SIMPLE_DEV_PM_OPS(tilcdc_pm_ops,
> + tilcdc_pm_suspend, tilcdc_pm_resume);
> 
> /*
> * Platform driver:
> @@ -597,7 +594,7 @@ static struct platform_driver tilcdc_platform_driver = {
>  .remove = tilcdc_pdev_remove,
>  .driver = {
>  .name = "tilcdc",
> - .pm = &tilcdc_pm_ops,
> + .pm = pm_sleep_ptr(&tilcdc_pm_ops),
>  .of_match_table = tilcdc_of_match,
>  },
> };
> -- 
> 2.35.1
>