From: Thomas Zimmermann <tzimmermann@suse.de>
To: airlied@linux.ie, daniel@ffwll.ch
Cc: nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org,
virtualization@lists.linux-foundation.org,
amd-gfx@lists.freedesktop.org,
Thomas Zimmermann <tzimmermann@suse.de>,
spice-devel@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH 03/15] drm/bochs: Remove references to struct drm_device.pdev
Date: Tue, 24 Nov 2020 12:38:12 +0100 [thread overview]
Message-ID: <20201124113824.19994-4-tzimmermann@suse.de> (raw)
In-Reply-To: <20201124113824.19994-1-tzimmermann@suse.de>
Using struct drm_device.pdev is deprecated. Convert bochs to struct
drm_device.dev. No functional changes.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/bochs/bochs_drv.c | 1 -
drivers/gpu/drm/bochs/bochs_hw.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
index fd454225fd19..b469624fe40d 100644
--- a/drivers/gpu/drm/bochs/bochs_drv.c
+++ b/drivers/gpu/drm/bochs/bochs_drv.c
@@ -121,7 +121,6 @@ static int bochs_pci_probe(struct pci_dev *pdev,
if (ret)
goto err_free_dev;
- dev->pdev = pdev;
pci_set_drvdata(pdev, dev);
ret = bochs_load(dev);
diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c
index dce4672e3fc8..2d7380a9890e 100644
--- a/drivers/gpu/drm/bochs/bochs_hw.c
+++ b/drivers/gpu/drm/bochs/bochs_hw.c
@@ -110,7 +110,7 @@ int bochs_hw_load_edid(struct bochs_device *bochs)
int bochs_hw_init(struct drm_device *dev)
{
struct bochs_device *bochs = dev->dev_private;
- struct pci_dev *pdev = dev->pdev;
+ struct pci_dev *pdev = to_pci_dev(dev->dev);
unsigned long addr, size, mem, ioaddr, iosize;
u16 id;
@@ -201,7 +201,7 @@ void bochs_hw_fini(struct drm_device *dev)
release_region(VBE_DISPI_IOPORT_INDEX, 2);
if (bochs->fb_map)
iounmap(bochs->fb_map);
- pci_release_regions(dev->pdev);
+ pci_release_regions(to_pci_dev(dev->dev));
kfree(bochs->edid);
}
--
2.29.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-11-24 11:39 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 11:38 [PATCH 00/15] drm: Move struct drm_device.pdev to legacy Thomas Zimmermann
2020-11-24 11:38 ` [PATCH 01/15] drm/amdgpu: Remove references to struct drm_device.pdev Thomas Zimmermann
2020-11-25 14:07 ` Alex Deucher
2020-11-24 11:38 ` [PATCH 02/15] drm/ast: " Thomas Zimmermann
2020-11-24 11:38 ` Thomas Zimmermann [this message]
2020-11-24 11:38 ` [PATCH 04/15] drm/cirrus: " Thomas Zimmermann
2020-11-24 11:38 ` [PATCH 05/15] drm/gma500: " Thomas Zimmermann
2020-11-24 21:31 ` Sam Ravnborg
2020-11-24 11:38 ` [PATCH 06/15] drm/hibmc: " Thomas Zimmermann
2020-11-24 11:38 ` [PATCH 07/15] drm/i915: " Thomas Zimmermann
2020-11-27 13:20 ` Joonas Lahtinen
2020-11-27 13:46 ` Thomas Zimmermann
2020-11-24 11:38 ` [PATCH 08/15] drm/mgag200: " Thomas Zimmermann
2020-11-24 11:38 ` [PATCH 09/15] drm/nouveau: " Thomas Zimmermann
2020-11-24 21:42 ` Sam Ravnborg
2020-12-01 9:50 ` Thomas Zimmermann
2020-11-24 11:38 ` [PATCH 10/15] drm/qxl: " Thomas Zimmermann
2020-11-24 11:38 ` [PATCH 11/15] drm/radeon: " Thomas Zimmermann
2020-11-25 14:09 ` Alex Deucher
2020-11-24 11:38 ` [PATCH 12/15] drm/vboxvideo: " Thomas Zimmermann
2020-11-24 11:38 ` [PATCH 13/15] drm/virtgpu: " Thomas Zimmermann
2020-11-24 11:38 ` [PATCH 14/15] drm/vmwgfx: " Thomas Zimmermann
2020-11-30 20:59 ` Zack Rusin
2020-12-02 8:01 ` Thomas Zimmermann
2020-12-02 14:27 ` Thomas Zimmermann
2020-12-02 15:37 ` Zack Rusin
2020-12-02 16:03 ` Daniel Vetter
2020-12-03 3:06 ` Zack Rusin
2020-12-03 15:12 ` Daniel Vetter
2020-12-04 5:06 ` Zack Rusin
2020-11-24 11:38 ` [PATCH 15/15] drm: Upcast struct drm_device.dev to struct pci_device; replace pdev Thomas Zimmermann
2020-11-24 21:46 ` Sam Ravnborg
2020-11-24 21:49 ` [PATCH 00/15] drm: Move struct drm_device.pdev to legacy Sam Ravnborg
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=20201124113824.19994-4-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@linux.ie \
--cc=amd-gfx@lists.freedesktop.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=nouveau@lists.freedesktop.org \
--cc=spice-devel@lists.freedesktop.org \
--cc=virtualization@lists.linux-foundation.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: 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).