drm/vboxvideo: Remove references to struct drm_device.pdev

Using struct drm_device.pdev is deprecated. Convert vboxvideo to struct
drm_device.dev. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201201103542.2182-18-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c
index f3eac72cb46ec22f23e05f3b7c6fbbb53251a650..e534896b6cfd16f1e4dcb680260f5565b35cadf2 100644 (file)
--- a/drivers/gpu/drm/vboxvideo/vbox_drv.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c
@@ -51,7 +51,6 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (IS_ERR(vbox))
                return PTR_ERR(vbox);
 
-       vbox->ddev.pdev = pdev;
        pci_set_drvdata(pdev, vbox);
        mutex_init(&vbox->hw_mutex);
 
@@ -109,15 +108,16 @@ static void vbox_pci_remove(struct pci_dev *pdev)
 static int vbox_pm_suspend(struct device *dev)
 {
        struct vbox_private *vbox = dev_get_drvdata(dev);
+       struct pci_dev *pdev = to_pci_dev(dev);
        int error;
 
        error = drm_mode_config_helper_suspend(&vbox->ddev);
        if (error)
                return error;
 
-       pci_save_state(vbox->ddev.pdev);
-       pci_disable_device(vbox->ddev.pdev);
-       pci_set_power_state(vbox->ddev.pdev, PCI_D3hot);
+       pci_save_state(pdev);
+       pci_disable_device(pdev);
+       pci_set_power_state(pdev, PCI_D3hot);
 
        return 0;
 }
@@ -125,8 +125,9 @@ static int vbox_pm_suspend(struct device *dev)
 static int vbox_pm_resume(struct device *dev)
 {
        struct vbox_private *vbox = dev_get_drvdata(dev);
+       struct pci_dev *pdev = to_pci_dev(dev);
 
-       if (pci_enable_device(vbox->ddev.pdev))
+       if (pci_enable_device(pdev))
                return -EIO;
 
        return drm_mode_config_helper_resume(&vbox->ddev);

diff --git a/drivers/gpu/drm/vboxvideo/vbox_irq.c b/drivers/gpu/drm/vboxvideo/vbox_irq.c
index 631657fa554f9a1a5b6104064697f7eec8b6c8fa..b3ded68603bad7f211dfeb43c50b7986b26c0110 100644 (file)
--- a/drivers/gpu/drm/vboxvideo/vbox_irq.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_irq.c
@@ -170,10 +170,12 @@ static void vbox_hotplug_worker(struct work_struct *work)
 
 int vbox_irq_init(struct vbox_private *vbox)
 {
+       struct pci_dev *pdev = to_pci_dev(vbox->ddev.dev);
+
        INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker);
        vbox_update_mode_hints(vbox);
 
-       return drm_irq_install(&vbox->ddev, vbox->ddev.pdev->irq);
+       return drm_irq_install(&vbox->ddev, pdev->irq);
 }
 
 void vbox_irq_fini(struct vbox_private *vbox)

diff --git a/drivers/gpu/drm/vboxvideo/vbox_main.c b/drivers/gpu/drm/vboxvideo/vbox_main.c
index d68d9bad76747015c446b3f5908014ca81dd3b70..f28779715ccda8332b3467a4ca27b8c1db8ac9b5 100644 (file)
--- a/drivers/gpu/drm/vboxvideo/vbox_main.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_main.c
@@ -8,7 +8,9 @@
  *          Hans de Goede <hdegoede@redhat.com>
  */
 
+#include <linux/pci.h>
 #include <linux/vbox_err.h>
+
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_damage_helper.h>
@@ -30,6 +32,7 @@ void vbox_report_caps(struct vbox_private *vbox)
 
 static int vbox_accel_init(struct vbox_private *vbox)
 {
+       struct pci_dev *pdev = to_pci_dev(vbox->ddev.dev);
        struct vbva_buffer *vbva;
        unsigned int i;
 
@@ -41,7 +44,7 @@ static int vbox_accel_init(struct vbox_private *vbox)
        /* Take a command buffer for each screen from the end of usable VRAM. */
        vbox->available_vram_size -= vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE;
 
-       vbox->vbva_buffers = pci_iomap_range(vbox->ddev.pdev, 0,
+       vbox->vbva_buffers = pci_iomap_range(pdev, 0,
                                             vbox->available_vram_size,
                                             vbox->num_crtcs *
                                             VBVA_MIN_BUFFER_SIZE);
@@ -106,6 +109,7 @@ bool vbox_check_supported(u16 id)
 
 int vbox_hw_init(struct vbox_private *vbox)
 {
+       struct pci_dev *pdev = to_pci_dev(vbox->ddev.dev);
        int ret = -ENOMEM;
 
        vbox->full_vram_size = inl(VBE_DISPI_IOPORT_DATA);
@@ -115,7 +119,7 @@ int vbox_hw_init(struct vbox_private *vbox)
 
        /* Map guest-heap at end of vram */
        vbox->guest_heap =
-           pci_iomap_range(vbox->ddev.pdev, 0, GUEST_HEAP_OFFSET(vbox),
+           pci_iomap_range(pdev, 0, GUEST_HEAP_OFFSET(vbox),
                            GUEST_HEAP_SIZE);
        if (!vbox->guest_heap)
                return -ENOMEM;

diff --git a/drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/gpu/drm/vboxvideo/vbox_ttm.c
index f5a06675da43c67abcf187f7bddc9b95f88e5f3a..0066a3c1dfc96fdd720cbcfc4923ad37775890f3 100644 (file)
--- a/drivers/gpu/drm/vboxvideo/vbox_ttm.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_ttm.c
@@ -15,8 +15,9 @@ int vbox_mm_init(struct vbox_private *vbox)
        struct drm_vram_mm *vmm;
        int ret;
        struct drm_device *dev = &vbox->ddev;
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
 
-       vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(dev->pdev, 0),
+       vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0),
                                       vbox->available_vram_size);
        if (IS_ERR(vmm)) {
                ret = PTR_ERR(vmm);
@@ -24,8 +25,8 @@ int vbox_mm_init(struct vbox_private *vbox)
                return ret;
        }
 
-       vbox->fb_mtrr = arch_phys_wc_add(pci_resource_start(dev->pdev, 0),
-                                        pci_resource_len(dev->pdev, 0));
+       vbox->fb_mtrr = arch_phys_wc_add(pci_resource_start(pdev, 0),
+                                        pci_resource_len(pdev, 0));
        return 0;
 }