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

drm/mgag200: Remove references to struct drm_device.pdev

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

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20201201103542.2182-13-tzimmermann@suse.de

+18 -14
+11 -9
drivers/gpu/drm/mgag200/mgag200_drv.c
··· 47 47 static bool mgag200_has_sgram(struct mga_device *mdev) 48 48 { 49 49 struct drm_device *dev = &mdev->base; 50 + struct pci_dev *pdev = to_pci_dev(dev->dev); 50 51 u32 option; 51 52 int ret; 52 53 53 - ret = pci_read_config_dword(dev->pdev, PCI_MGA_OPTION, &option); 54 + ret = pci_read_config_dword(pdev, PCI_MGA_OPTION, &option); 54 55 if (drm_WARN(dev, ret, "failed to read PCI config dword: %d\n", ret)) 55 56 return false; 56 57 ··· 61 60 static int mgag200_regs_init(struct mga_device *mdev) 62 61 { 63 62 struct drm_device *dev = &mdev->base; 63 + struct pci_dev *pdev = to_pci_dev(dev->dev); 64 64 u32 option, option2; 65 65 u8 crtcext3; 66 66 ··· 101 99 } 102 100 103 101 if (option) 104 - pci_write_config_dword(dev->pdev, PCI_MGA_OPTION, option); 102 + pci_write_config_dword(pdev, PCI_MGA_OPTION, option); 105 103 if (option2) 106 - pci_write_config_dword(dev->pdev, PCI_MGA_OPTION2, option2); 104 + pci_write_config_dword(pdev, PCI_MGA_OPTION2, option2); 107 105 108 106 /* BAR 1 contains registers */ 109 - mdev->rmmio_base = pci_resource_start(dev->pdev, 1); 110 - mdev->rmmio_size = pci_resource_len(dev->pdev, 1); 107 + mdev->rmmio_base = pci_resource_start(pdev, 1); 108 + mdev->rmmio_size = pci_resource_len(pdev, 1); 111 109 112 110 if (!devm_request_mem_region(dev->dev, mdev->rmmio_base, 113 111 mdev->rmmio_size, "mgadrmfb_mmio")) { ··· 115 113 return -ENOMEM; 116 114 } 117 115 118 - mdev->rmmio = pcim_iomap(dev->pdev, 1, 0); 116 + mdev->rmmio = pcim_iomap(pdev, 1, 0); 119 117 if (mdev->rmmio == NULL) 120 118 return -ENOMEM; 121 119 ··· 220 218 static void mgag200_g200_init_refclk(struct mga_device *mdev) 221 219 { 222 220 struct drm_device *dev = &mdev->base; 221 + struct pci_dev *pdev = to_pci_dev(dev->dev); 223 222 unsigned char __iomem *rom; 224 223 unsigned char *bios; 225 224 size_t size; ··· 229 226 mdev->model.g200.pclk_max = 230000; 230 227 mdev->model.g200.ref_clk = 27050; 231 228 232 - rom = pci_map_rom(dev->pdev, &size); 229 + rom = pci_map_rom(pdev, &size); 233 230 if (!rom) 234 231 return; 235 232 ··· 247 244 248 245 vfree(bios); 249 246 out: 250 - pci_unmap_rom(dev->pdev, rom); 247 + pci_unmap_rom(pdev, rom); 251 248 } 252 249 253 250 static void mgag200_g200se_init_unique_id(struct mga_device *mdev) ··· 304 301 return mdev; 305 302 dev = &mdev->base; 306 303 307 - dev->pdev = pdev; 308 304 pci_set_drvdata(pdev, dev); 309 305 310 306 ret = mgag200_device_init(mdev, flags);
+1 -1
drivers/gpu/drm/mgag200/mgag200_i2c.c
··· 126 126 i2c->clock = clock; 127 127 i2c->adapter.owner = THIS_MODULE; 128 128 i2c->adapter.class = I2C_CLASS_DDC; 129 - i2c->adapter.dev.parent = &dev->pdev->dev; 129 + i2c->adapter.dev.parent = dev->dev; 130 130 i2c->dev = dev; 131 131 i2c_set_adapdata(&i2c->adapter, i2c); 132 132 snprintf(i2c->adapter.name, sizeof(i2c->adapter.name), "mga i2c");
+6 -4
drivers/gpu/drm/mgag200/mgag200_mm.c
··· 78 78 static void mgag200_mm_release(struct drm_device *dev, void *ptr) 79 79 { 80 80 struct mga_device *mdev = to_mga_device(dev); 81 + struct pci_dev *pdev = to_pci_dev(dev->dev); 81 82 82 83 mdev->vram_fb_available = 0; 83 84 iounmap(mdev->vram); 84 - arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0), 85 - pci_resource_len(dev->pdev, 0)); 85 + arch_io_free_memtype_wc(pci_resource_start(pdev, 0), 86 + pci_resource_len(pdev, 0)); 86 87 arch_phys_wc_del(mdev->fb_mtrr); 87 88 mdev->fb_mtrr = 0; 88 89 } ··· 91 90 int mgag200_mm_init(struct mga_device *mdev) 92 91 { 93 92 struct drm_device *dev = &mdev->base; 93 + struct pci_dev *pdev = to_pci_dev(dev->dev); 94 94 u8 misc; 95 95 resource_size_t start, len; 96 96 int ret; ··· 104 102 WREG8(MGA_MISC_OUT, misc); 105 103 106 104 /* BAR 0 is VRAM */ 107 - start = pci_resource_start(dev->pdev, 0); 108 - len = pci_resource_len(dev->pdev, 0); 105 + start = pci_resource_start(pdev, 0); 106 + len = pci_resource_len(pdev, 0); 109 107 110 108 if (!devm_request_mem_region(dev->dev, start, len, "mgadrmfb_vram")) { 111 109 drm_err(dev, "can't reserve VRAM\n");