dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Paul Cercueil <paul@crapouillou.net>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>
Cc: Paul Cercueil <paul@crapouillou.net>,
	Hans de Goede <hdegoede@redhat.com>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: [PATCH 22/26] drm: vboxvideo: Remove #ifdef guards for PM related functions
Date: Mon,  7 Nov 2022 17:52:52 +0000	[thread overview]
Message-ID: <20221107175256.360839-12-paul@crapouillou.net> (raw)
In-Reply-To: <20221107175256.360839-1-paul@crapouillou.net>

Use the pm_sleep_ptr() macro to handle the .suspend / .resume callbacks.

This macro allows 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>
---
Cc: Hans de Goede <hdegoede@redhat.com>
---
 drivers/gpu/drm/vboxvideo/vbox_drv.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c
index f4f2bd79a7cb..79318441ed7e 100644
--- a/drivers/gpu/drm/vboxvideo/vbox_drv.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c
@@ -102,7 +102,6 @@ static void vbox_pci_remove(struct pci_dev *pdev)
 	vbox_hw_fini(vbox);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int vbox_pm_suspend(struct device *dev)
 {
 	struct vbox_private *vbox = dev_get_drvdata(dev);
@@ -160,16 +159,13 @@ static const struct dev_pm_ops vbox_pm_ops = {
 	.poweroff = vbox_pm_poweroff,
 	.restore = vbox_pm_resume,
 };
-#endif
 
 static struct pci_driver vbox_pci_driver = {
 	.name = DRIVER_NAME,
 	.id_table = pciidlist,
 	.probe = vbox_pci_probe,
 	.remove = vbox_pci_remove,
-#ifdef CONFIG_PM_SLEEP
-	.driver.pm = &vbox_pm_ops,
-#endif
+	.driver.pm = pm_sleep_ptr(&vbox_pm_ops),
 };
 
 DEFINE_DRM_GEM_FOPS(vbox_fops);
-- 
2.35.1


  parent reply	other threads:[~2022-11-07 17:54 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-07 17:50 [PATCH 00/26] drm: Get rid of #ifdef CONFIG_PM* guards Paul Cercueil
2022-11-07 17:50 ` [PATCH 01/26] drm: modeset-helper: Export dev_pm_ops for simple drivers Paul Cercueil
2022-11-08 12:10   ` Thomas Zimmermann
2022-11-08 12:33     ` Paul Cercueil
2022-11-07 17:50 ` [PATCH 02/26] drm: bochs: Use the dev_pm_ops provided by modeset helper Paul Cercueil
2022-11-07 17:50 ` [PATCH 03/26] drm: imx: " Paul Cercueil
2022-11-07 17:50 ` [PATCH 04/26] drm: rockchip: " Paul Cercueil
2022-11-07 17:50 ` [PATCH 05/26] drm: tegra: " Paul Cercueil
2022-11-07 17:50 ` [PATCH 06/26] drm: sun4i: " Paul Cercueil
2022-11-14  0:34   ` Samuel Holland
2022-11-07 17:50 ` [PATCH 07/26] drm: msxfb: " Paul Cercueil
2022-11-07 17:50 ` [PATCH 08/26] drm: atmel-hlcdc: Remove #ifdef guards for PM related functions Paul Cercueil
2022-11-07 17:53   ` Sam Ravnborg
2022-11-10 15:28   ` Claudiu.Beznea
2022-11-07 17:50 ` [PATCH 09/26] drm: exynos: " Paul Cercueil
2022-11-21  4:25   ` Inki Dae
2022-11-07 17:50 ` [PATCH 10/26] drm: imx/dcss: " Paul Cercueil
2022-11-11 14:27   ` Laurentiu Palcu
2022-11-07 17:52 ` [PATCH 11/26] drm: bridge/dw-hdmi: " Paul Cercueil
2022-11-07 17:52   ` [PATCH 12/26] drm: etnaviv: " Paul Cercueil
2022-11-07 18:07     ` Lucas Stach
2022-11-07 21:03       ` Paul Cercueil
2022-11-07 17:52   ` [PATCH 13/26] drm: fsl-dcu: " Paul Cercueil
2022-11-07 17:52   ` [PATCH 14/26] drm: mediatek: " Paul Cercueil
2022-11-07 17:52   ` [PATCH 15/26] drm: omap: " Paul Cercueil
2022-11-07 17:52   ` [PATCH 16/26] drm: panfrost: " Paul Cercueil
2022-11-09 15:16     ` Steven Price
2022-11-07 17:52   ` [PATCH 17/26] drm: rcar-du: " Paul Cercueil
2022-11-16 13:41     ` Kieran Bingham
2022-11-07 17:52   ` [PATCH 18/26] drm: rockchip: " Paul Cercueil
2022-11-07 17:52   ` [PATCH 19/26] drm: shmobile: " Paul Cercueil
2022-11-16 13:41     ` Kieran Bingham
2022-11-07 17:52   ` [PATCH 20/26] drm: tegra: " Paul Cercueil
2022-11-07 17:52   ` [PATCH 21/26] drm: tilcdc: " Paul Cercueil
2022-11-07 17:52   ` Paul Cercueil [this message]
2022-11-07 19:43     ` [PATCH 22/26] drm: vboxvideo: " Hans de Goede
2022-11-07 17:52   ` [PATCH 23/26] drm: vc4: " Paul Cercueil
2022-11-07 20:27   ` [PATCH 21/26] drm: tilcdc: " sarha
2022-11-07 17:55 ` [PATCH 24/26] drm: gm12u320: " Paul Cercueil
2022-11-07 17:55   ` [PATCH 25/26] drm: tidss: " Paul Cercueil
2022-11-07 17:55   ` [PATCH 26/26] drm/i915/gt: " Paul Cercueil
2022-11-07 20:31     ` Rodrigo Vivi
2022-11-07 20:59       ` Paul Cercueil
2022-11-07 19:43   ` [PATCH 24/26] drm: gm12u320: " Hans de Goede

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=20221107175256.360839-12-paul@crapouillou.net \
    --to=paul@crapouillou.net \
    --cc=airlied@gmail.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hdegoede@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=tzimmermann@suse.de \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).