From: Paul Cercueil <paul@crapouillou.net> To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: Paul Cercueil <paul@crapouillou.net>, Tomi Valkeinen <tomba@kernel.org>, Jyri Sarha <jyri.sarha@iki.fi>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 25/26] drm: tidss: Remove #ifdef guards for PM related functions Date: Tue, 29 Nov 2022 19:19:41 +0000 [thread overview] Message-ID: <20221129191942.138244-12-paul@crapouillou.net> (raw) In-Reply-To: <20221129191942.138244-1-paul@crapouillou.net> Use the SYSTEM_SLEEP_PM_OPS() and RUNTIME_PM_OPS() macros to handle the PM callbacks. These macros allow the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM 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. It also allows to drop the __maybe_unused tags. Some #ifndef CONFIG_PM guards were protecting simple statements, and were also converted to "if (!IS_ENABLED(CONFIG_PM))". Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Cc: Jyri Sarha <jyri.sarha@iki.fi> Cc: Tomi Valkeinen <tomba@kernel.org> --- drivers/gpu/drm/tidss/tidss_drv.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c index 07d94b1e8089..3f0217256948 100644 --- a/drivers/gpu/drm/tidss/tidss_drv.c +++ b/drivers/gpu/drm/tidss/tidss_drv.c @@ -48,7 +48,7 @@ void tidss_runtime_put(struct tidss_device *tidss) WARN_ON(r < 0); } -static int __maybe_unused tidss_pm_runtime_suspend(struct device *dev) +static int tidss_pm_runtime_suspend(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); @@ -57,7 +57,7 @@ static int __maybe_unused tidss_pm_runtime_suspend(struct device *dev) return dispc_runtime_suspend(tidss->dispc); } -static int __maybe_unused tidss_pm_runtime_resume(struct device *dev) +static int tidss_pm_runtime_resume(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); int r; @@ -71,7 +71,7 @@ static int __maybe_unused tidss_pm_runtime_resume(struct device *dev) return 0; } -static int __maybe_unused tidss_suspend(struct device *dev) +static int tidss_suspend(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); @@ -80,7 +80,7 @@ static int __maybe_unused tidss_suspend(struct device *dev) return drm_mode_config_helper_suspend(&tidss->ddev); } -static int __maybe_unused tidss_resume(struct device *dev) +static int tidss_resume(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); @@ -89,9 +89,9 @@ static int __maybe_unused tidss_resume(struct device *dev) return drm_mode_config_helper_resume(&tidss->ddev); } -static __maybe_unused const struct dev_pm_ops tidss_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(tidss_suspend, tidss_resume) - SET_RUNTIME_PM_OPS(tidss_pm_runtime_suspend, tidss_pm_runtime_resume, NULL) +static const struct dev_pm_ops tidss_pm_ops = { + SYSTEM_SLEEP_PM_OPS(tidss_suspend, tidss_resume) + RUNTIME_PM_OPS(tidss_pm_runtime_suspend, tidss_pm_runtime_resume, NULL) }; /* DRM device Information */ @@ -145,10 +145,9 @@ static int tidss_probe(struct platform_device *pdev) pm_runtime_enable(dev); -#ifndef CONFIG_PM /* If we don't have PM, we need to call resume manually */ - dispc_runtime_resume(tidss->dispc); -#endif + if (!IS_ENABLED(CONFIG_PM)) + dispc_runtime_resume(tidss->dispc); ret = tidss_modeset_init(tidss); if (ret < 0) { @@ -190,9 +189,8 @@ static int tidss_probe(struct platform_device *pdev) tidss_irq_uninstall(ddev); err_runtime_suspend: -#ifndef CONFIG_PM - dispc_runtime_suspend(tidss->dispc); -#endif + if (!IS_ENABLED(CONFIG_PM)) + dispc_runtime_suspend(tidss->dispc); pm_runtime_disable(dev); return ret; @@ -212,10 +210,9 @@ static int tidss_remove(struct platform_device *pdev) tidss_irq_uninstall(ddev); -#ifndef CONFIG_PM /* If we don't have PM, we need to call suspend manually */ - dispc_runtime_suspend(tidss->dispc); -#endif + if (!IS_ENABLED(CONFIG_PM)) + dispc_runtime_suspend(tidss->dispc); pm_runtime_disable(dev); /* devm allocated dispc goes away with the dev so mark it NULL */ -- 2.35.1
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net> To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil <paul@crapouillou.net>, Jyri Sarha <jyri.sarha@iki.fi>, Tomi Valkeinen <tomba@kernel.org> Subject: [PATCH v2 25/26] drm: tidss: Remove #ifdef guards for PM related functions Date: Tue, 29 Nov 2022 19:19:41 +0000 [thread overview] Message-ID: <20221129191942.138244-12-paul@crapouillou.net> (raw) In-Reply-To: <20221129191942.138244-1-paul@crapouillou.net> Use the SYSTEM_SLEEP_PM_OPS() and RUNTIME_PM_OPS() macros to handle the PM callbacks. These macros allow the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM 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. It also allows to drop the __maybe_unused tags. Some #ifndef CONFIG_PM guards were protecting simple statements, and were also converted to "if (!IS_ENABLED(CONFIG_PM))". Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Cc: Jyri Sarha <jyri.sarha@iki.fi> Cc: Tomi Valkeinen <tomba@kernel.org> --- drivers/gpu/drm/tidss/tidss_drv.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c index 07d94b1e8089..3f0217256948 100644 --- a/drivers/gpu/drm/tidss/tidss_drv.c +++ b/drivers/gpu/drm/tidss/tidss_drv.c @@ -48,7 +48,7 @@ void tidss_runtime_put(struct tidss_device *tidss) WARN_ON(r < 0); } -static int __maybe_unused tidss_pm_runtime_suspend(struct device *dev) +static int tidss_pm_runtime_suspend(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); @@ -57,7 +57,7 @@ static int __maybe_unused tidss_pm_runtime_suspend(struct device *dev) return dispc_runtime_suspend(tidss->dispc); } -static int __maybe_unused tidss_pm_runtime_resume(struct device *dev) +static int tidss_pm_runtime_resume(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); int r; @@ -71,7 +71,7 @@ static int __maybe_unused tidss_pm_runtime_resume(struct device *dev) return 0; } -static int __maybe_unused tidss_suspend(struct device *dev) +static int tidss_suspend(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); @@ -80,7 +80,7 @@ static int __maybe_unused tidss_suspend(struct device *dev) return drm_mode_config_helper_suspend(&tidss->ddev); } -static int __maybe_unused tidss_resume(struct device *dev) +static int tidss_resume(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); @@ -89,9 +89,9 @@ static int __maybe_unused tidss_resume(struct device *dev) return drm_mode_config_helper_resume(&tidss->ddev); } -static __maybe_unused const struct dev_pm_ops tidss_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(tidss_suspend, tidss_resume) - SET_RUNTIME_PM_OPS(tidss_pm_runtime_suspend, tidss_pm_runtime_resume, NULL) +static const struct dev_pm_ops tidss_pm_ops = { + SYSTEM_SLEEP_PM_OPS(tidss_suspend, tidss_resume) + RUNTIME_PM_OPS(tidss_pm_runtime_suspend, tidss_pm_runtime_resume, NULL) }; /* DRM device Information */ @@ -145,10 +145,9 @@ static int tidss_probe(struct platform_device *pdev) pm_runtime_enable(dev); -#ifndef CONFIG_PM /* If we don't have PM, we need to call resume manually */ - dispc_runtime_resume(tidss->dispc); -#endif + if (!IS_ENABLED(CONFIG_PM)) + dispc_runtime_resume(tidss->dispc); ret = tidss_modeset_init(tidss); if (ret < 0) { @@ -190,9 +189,8 @@ static int tidss_probe(struct platform_device *pdev) tidss_irq_uninstall(ddev); err_runtime_suspend: -#ifndef CONFIG_PM - dispc_runtime_suspend(tidss->dispc); -#endif + if (!IS_ENABLED(CONFIG_PM)) + dispc_runtime_suspend(tidss->dispc); pm_runtime_disable(dev); return ret; @@ -212,10 +210,9 @@ static int tidss_remove(struct platform_device *pdev) tidss_irq_uninstall(ddev); -#ifndef CONFIG_PM /* If we don't have PM, we need to call suspend manually */ - dispc_runtime_suspend(tidss->dispc); -#endif + if (!IS_ENABLED(CONFIG_PM)) + dispc_runtime_suspend(tidss->dispc); pm_runtime_disable(dev); /* devm allocated dispc goes away with the dev so mark it NULL */ -- 2.35.1
next prev parent reply other threads:[~2022-11-29 19:21 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-29 19:17 [PATCH v2 00/26] drm: Get rid of #ifdef CONFIG_PM* guards Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 01/26] drm: modeset-helper: Add DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS macro Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 02/26] drm: bochs: Define and use generic PM ops Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 03/26] drm: imx: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 04/26] drm: rockchip: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 05/26] drm: tegra: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 06/26] drm: sun4i: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-30 4:08 ` Samuel Holland 2022-11-30 4:08 ` Samuel Holland 2022-11-30 4:08 ` Samuel Holland 2022-11-29 19:17 ` [PATCH v2 07/26] drm: mxsfb: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 21:48 ` Marek Vasut 2022-11-29 21:48 ` Marek Vasut 2022-11-29 21:48 ` Marek Vasut 2022-11-29 19:17 ` [PATCH v2 08/26] drm: atmel-hlcdc: Remove #ifdef guards for PM related functions Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 09/26] drm: exynos: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 10/26] drm: imx/dcss: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 11/26] drm: bridge/dw-hdmi: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 12/26] drm: etnaviv: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-12-15 19:22 ` Lucas Stach 2022-12-15 19:22 ` Lucas Stach 2022-11-29 19:17 ` [PATCH v2 13/26] drm: fsl-dcu: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` [PATCH v2 14/26] drm: mediatek: " Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:17 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 15/26] drm: omap: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 16/26] drm: panfrost: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:54 ` Alyssa Rosenzweig 2022-11-29 19:54 ` Alyssa Rosenzweig 2022-11-29 19:19 ` [PATCH v2 17/26] drm: rcar-du: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:43 ` Laurent Pinchart 2022-11-29 19:43 ` Laurent Pinchart 2022-11-29 21:05 ` Paul Cercueil 2022-11-29 21:05 ` Paul Cercueil 2022-11-29 21:24 ` Laurent Pinchart 2022-11-29 21:24 ` Laurent Pinchart 2022-11-29 19:19 ` [PATCH v2 18/26] drm: rockchip: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 19/26] drm: shmobile: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:44 ` Laurent Pinchart 2022-11-29 19:44 ` Laurent Pinchart 2022-11-29 19:19 ` [PATCH v2 20/26] drm: tegra: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 21/26] drm: tilcdc: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 22/26] drm: vboxvideo: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 23/26] drm: vc4: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 24/26] drm: gm12u320: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil [this message] 2022-11-29 19:19 ` [PATCH v2 25/26] drm: tidss: " Paul Cercueil 2022-11-29 19:19 ` [PATCH v2 26/26] drm/i915/gt: " Paul Cercueil 2022-11-29 19:19 ` Paul Cercueil 2022-11-29 19:19 ` [Intel-gfx] " Paul Cercueil 2022-12-07 15:56 ` Rodrigo Vivi 2022-12-07 15:56 ` Rodrigo Vivi 2022-12-07 15:56 ` Rodrigo Vivi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221129191942.138244-12-paul@crapouillou.net \ --to=paul@crapouillou.net \ --cc=airlied@gmail.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=jyri.sarha@iki.fi \ --cc=linux-kernel@vger.kernel.org \ --cc=tomba@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.