| Message ID | 20221107175256.360839-1-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: Get rid of #ifdef CONFIG_PM* guards | expand |
November 7, 2022 at 7:52 PM, "Paul Cercueil" <paul@crapouillou.net mailto:paul@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@crapouillou.net> Acked-by: Jyri Sarha <jyri.sarhaı@iki.fi> > --- > Cc: Jyri Sarha <jyri.sarha@iki.fi> > Cc: Tomi Valkeinen <tomba@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 >
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c index 4efb62bcdb63..2ae231af7e4b 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c @@ -593,7 +593,6 @@ static int snd_dw_hdmi_remove(struct platform_device *pdev) return 0; } -#if defined(CONFIG_PM_SLEEP) && defined(IS_NOT_BROKEN) /* * This code is fine, but requires implementation in the dw_hdmi_trigger() * method which is currently missing as I have no way to test this. @@ -602,7 +601,8 @@ static int snd_dw_hdmi_suspend(struct device *dev) { struct snd_dw_hdmi *dw = dev_get_drvdata(dev); - snd_power_change_state(dw->card, SNDRV_CTL_POWER_D3cold); + if (IS_ENABLED(IS_NOT_BROKEN)) + snd_power_change_state(dw->card, SNDRV_CTL_POWER_D3cold); return 0; } @@ -611,24 +611,21 @@ static int snd_dw_hdmi_resume(struct device *dev) { struct snd_dw_hdmi *dw = dev_get_drvdata(dev); - snd_power_change_state(dw->card, SNDRV_CTL_POWER_D0); + if (IS_ENABLED(IS_NOT_BROKEN)) + snd_power_change_state(dw->card, SNDRV_CTL_POWER_D0); return 0; } -static SIMPLE_DEV_PM_OPS(snd_dw_hdmi_pm, snd_dw_hdmi_suspend, - snd_dw_hdmi_resume); -#define PM_OPS &snd_dw_hdmi_pm -#else -#define PM_OPS NULL -#endif +static DEFINE_SIMPLE_DEV_PM_OPS(snd_dw_hdmi_pm_ops, snd_dw_hdmi_suspend, + snd_dw_hdmi_resume); static struct platform_driver snd_dw_hdmi_driver = { .probe = snd_dw_hdmi_probe, .remove = snd_dw_hdmi_remove, .driver = { .name = DRIVER_NAME, - .pm = PM_OPS, + .pm = pm_sleep_ptr(&snd_dw_hdmi_pm_ops), }, };
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. The #ifdef IS_NOT_BROKEN guard was also changed to a IS_ENABLED(IS_NOT_BROKEN) check within the PM functions. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Note: Checkpatch complains as I replaced a "#if defined(IS_NOT_BROKEN)" to a "if (IS_ENABLED(IS_NOT_BROKEN))". I don't really know how to make it better so I left it like that. Cc: Andrzej Hajda <andrzej.hajda@intel.com> Cc: Neil Armstrong <neil.armstrong@linaro.org> Cc: Robert Foss <robert.foss@linaro.org> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> Cc: Jonas Karlman <jonas@kwiboo.se> Cc: Jernej Skrabec <jernej.skrabec@gmail.com> --- .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)