Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+19 -11
+6 -5
drivers/gpu/drm/vboxvideo/vbox_drv.c
··· 51 51 if (IS_ERR(vbox)) 52 52 return PTR_ERR(vbox); 53 53 54 - vbox->ddev.pdev = pdev; 55 54 pci_set_drvdata(pdev, vbox); 56 55 mutex_init(&vbox->hw_mutex); 57 56 ··· 108 109 static int vbox_pm_suspend(struct device *dev) 109 110 { 110 111 struct vbox_private *vbox = dev_get_drvdata(dev); 112 + struct pci_dev *pdev = to_pci_dev(dev); 111 113 int error; 112 114 113 115 error = drm_mode_config_helper_suspend(&vbox->ddev); 114 116 if (error) 115 117 return error; 116 118 117 - pci_save_state(vbox->ddev.pdev); 118 - pci_disable_device(vbox->ddev.pdev); 119 - pci_set_power_state(vbox->ddev.pdev, PCI_D3hot); 119 + pci_save_state(pdev); 120 + pci_disable_device(pdev); 121 + pci_set_power_state(pdev, PCI_D3hot); 120 122 121 123 return 0; 122 124 } ··· 125 125 static int vbox_pm_resume(struct device *dev) 126 126 { 127 127 struct vbox_private *vbox = dev_get_drvdata(dev); 128 + struct pci_dev *pdev = to_pci_dev(dev); 128 129 129 - if (pci_enable_device(vbox->ddev.pdev)) 130 + if (pci_enable_device(pdev)) 130 131 return -EIO; 131 132 132 133 return drm_mode_config_helper_resume(&vbox->ddev);
+3 -1
drivers/gpu/drm/vboxvideo/vbox_irq.c
··· 170 170 171 171 int vbox_irq_init(struct vbox_private *vbox) 172 172 { 173 + struct pci_dev *pdev = to_pci_dev(vbox->ddev.dev); 174 + 173 175 INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker); 174 176 vbox_update_mode_hints(vbox); 175 177 176 - return drm_irq_install(&vbox->ddev, vbox->ddev.pdev->irq); 178 + return drm_irq_install(&vbox->ddev, pdev->irq); 177 179 } 178 180 179 181 void vbox_irq_fini(struct vbox_private *vbox)
+6 -2
drivers/gpu/drm/vboxvideo/vbox_main.c
··· 8 8 * Hans de Goede <hdegoede@redhat.com> 9 9 */ 10 10 11 + #include <linux/pci.h> 11 12 #include <linux/vbox_err.h> 13 + 12 14 #include <drm/drm_fb_helper.h> 13 15 #include <drm/drm_crtc_helper.h> 14 16 #include <drm/drm_damage_helper.h> ··· 32 30 33 31 static int vbox_accel_init(struct vbox_private *vbox) 34 32 { 33 + struct pci_dev *pdev = to_pci_dev(vbox->ddev.dev); 35 34 struct vbva_buffer *vbva; 36 35 unsigned int i; 37 36 ··· 44 41 /* Take a command buffer for each screen from the end of usable VRAM. */ 45 42 vbox->available_vram_size -= vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE; 46 43 47 - vbox->vbva_buffers = pci_iomap_range(vbox->ddev.pdev, 0, 44 + vbox->vbva_buffers = pci_iomap_range(pdev, 0, 48 45 vbox->available_vram_size, 49 46 vbox->num_crtcs * 50 47 VBVA_MIN_BUFFER_SIZE); ··· 109 106 110 107 int vbox_hw_init(struct vbox_private *vbox) 111 108 { 109 + struct pci_dev *pdev = to_pci_dev(vbox->ddev.dev); 112 110 int ret = -ENOMEM; 113 111 114 112 vbox->full_vram_size = inl(VBE_DISPI_IOPORT_DATA); ··· 119 115 120 116 /* Map guest-heap at end of vram */ 121 117 vbox->guest_heap = 122 - pci_iomap_range(vbox->ddev.pdev, 0, GUEST_HEAP_OFFSET(vbox), 118 + pci_iomap_range(pdev, 0, GUEST_HEAP_OFFSET(vbox), 123 119 GUEST_HEAP_SIZE); 124 120 if (!vbox->guest_heap) 125 121 return -ENOMEM;
+4 -3
drivers/gpu/drm/vboxvideo/vbox_ttm.c
··· 15 15 struct drm_vram_mm *vmm; 16 16 int ret; 17 17 struct drm_device *dev = &vbox->ddev; 18 + struct pci_dev *pdev = to_pci_dev(dev->dev); 18 19 19 - vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(dev->pdev, 0), 20 + vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0), 20 21 vbox->available_vram_size); 21 22 if (IS_ERR(vmm)) { 22 23 ret = PTR_ERR(vmm); ··· 25 24 return ret; 26 25 } 27 26 28 - vbox->fb_mtrr = arch_phys_wc_add(pci_resource_start(dev->pdev, 0), 29 - pci_resource_len(dev->pdev, 0)); 27 + vbox->fb_mtrr = arch_phys_wc_add(pci_resource_start(pdev, 0), 28 + pci_resource_len(pdev, 0)); 30 29 return 0; 31 30 } 32 31