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

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index a977c9f..4e4c105 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -47,10 +47,11 @@ static const struct drm_driver mgag200_driver = {
 static bool mgag200_has_sgram(struct mga_device *mdev)
 {
        struct drm_device *dev = &mdev->base;
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        u32 option;
        int ret;
 
-       ret = pci_read_config_dword(dev->pdev, PCI_MGA_OPTION, &option);
+       ret = pci_read_config_dword(pdev, PCI_MGA_OPTION, &option);
        if (drm_WARN(dev, ret, "failed to read PCI config dword: %d\n", ret))
                return false;
 
@@ -60,6 +61,7 @@ static bool mgag200_has_sgram(struct mga_device *mdev)
 static int mgag200_regs_init(struct mga_device *mdev)
 {
        struct drm_device *dev = &mdev->base;
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        u32 option, option2;
        u8 crtcext3;
 
@@ -99,13 +101,13 @@ static int mgag200_regs_init(struct mga_device *mdev)
        }
 
        if (option)
-               pci_write_config_dword(dev->pdev, PCI_MGA_OPTION, option);
+               pci_write_config_dword(pdev, PCI_MGA_OPTION, option);
        if (option2)
-               pci_write_config_dword(dev->pdev, PCI_MGA_OPTION2, option2);
+               pci_write_config_dword(pdev, PCI_MGA_OPTION2, option2);
 
        /* BAR 1 contains registers */
-       mdev->rmmio_base = pci_resource_start(dev->pdev, 1);
-       mdev->rmmio_size = pci_resource_len(dev->pdev, 1);
+       mdev->rmmio_base = pci_resource_start(pdev, 1);
+       mdev->rmmio_size = pci_resource_len(pdev, 1);
 
        if (!devm_request_mem_region(dev->dev, mdev->rmmio_base,
                                     mdev->rmmio_size, "mgadrmfb_mmio")) {
@@ -113,7 +115,7 @@ static int mgag200_regs_init(struct mga_device *mdev)
                return -ENOMEM;
        }
 
-       mdev->rmmio = pcim_iomap(dev->pdev, 1, 0);
+       mdev->rmmio = pcim_iomap(pdev, 1, 0);
        if (mdev->rmmio == NULL)
                return -ENOMEM;
 
@@ -218,6 +220,7 @@ static void mgag200_g200_interpret_bios(struct mga_device *mdev,
 static void mgag200_g200_init_refclk(struct mga_device *mdev)
 {
        struct drm_device *dev = &mdev->base;
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        unsigned char __iomem *rom;
        unsigned char *bios;
        size_t size;
@@ -226,7 +229,7 @@ static void mgag200_g200_init_refclk(struct mga_device *mdev)
        mdev->model.g200.pclk_max = 230000;
        mdev->model.g200.ref_clk = 27050;
 
-       rom = pci_map_rom(dev->pdev, &size);
+       rom = pci_map_rom(pdev, &size);
        if (!rom)
                return;
 
@@ -244,7 +247,7 @@ static void mgag200_g200_init_refclk(struct mga_device *mdev)
 
        vfree(bios);
 out:
-       pci_unmap_rom(dev->pdev, rom);
+       pci_unmap_rom(pdev, rom);
 }
 
 static void mgag200_g200se_init_unique_id(struct mga_device *mdev)
@@ -301,7 +304,6 @@ mgag200_device_create(struct pci_dev *pdev, unsigned long flags)
                return mdev;
        dev = &mdev->base;
 
-       dev->pdev = pdev;
        pci_set_drvdata(pdev, dev);
 
        ret = mgag200_device_init(mdev, flags);

diff --git a/drivers/gpu/drm/mgag200/mgag200_i2c.c b/drivers/gpu/drm/mgag200/mgag200_i2c.c
index 09731e6..ac8e34e 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_i2c.c
+++ b/drivers/gpu/drm/mgag200/mgag200_i2c.c
@@ -126,7 +126,7 @@ struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev)
        i2c->clock = clock;
        i2c->adapter.owner = THIS_MODULE;
        i2c->adapter.class = I2C_CLASS_DDC;
-       i2c->adapter.dev.parent = &dev->pdev->dev;
+       i2c->adapter.dev.parent = dev->dev;
        i2c->dev = dev;
        i2c_set_adapdata(&i2c->adapter, i2c);
        snprintf(i2c->adapter.name, sizeof(i2c->adapter.name), "mga i2c");

diff --git a/drivers/gpu/drm/mgag200/mgag200_mm.c b/drivers/gpu/drm/mgag200/mgag200_mm.c
index 641f1aa..b667371 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mm.c
@@ -78,11 +78,12 @@ static size_t mgag200_probe_vram(struct mga_device *mdev, void __iomem *mem,
 static void mgag200_mm_release(struct drm_device *dev, void *ptr)
 {
        struct mga_device *mdev = to_mga_device(dev);
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
 
        mdev->vram_fb_available = 0;
        iounmap(mdev->vram);
-       arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0),
-                               pci_resource_len(dev->pdev, 0));
+       arch_io_free_memtype_wc(pci_resource_start(pdev, 0),
+                               pci_resource_len(pdev, 0));
        arch_phys_wc_del(mdev->fb_mtrr);
        mdev->fb_mtrr = 0;
 }
@@ -90,6 +91,7 @@ static void mgag200_mm_release(struct drm_device *dev, void *ptr)
 int mgag200_mm_init(struct mga_device *mdev)
 {
        struct drm_device *dev = &mdev->base;
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        u8 misc;
        resource_size_t start, len;
        int ret;
@@ -102,8 +104,8 @@ int mgag200_mm_init(struct mga_device *mdev)
        WREG8(MGA_MISC_OUT, misc);
 
        /* BAR 0 is VRAM */
-       start = pci_resource_start(dev->pdev, 0);
-       len = pci_resource_len(dev->pdev, 0);
+       start = pci_resource_start(pdev, 0);
+       len = pci_resource_len(pdev, 0);
 
        if (!devm_request_mem_region(dev->dev, start, len, "mgadrmfb_vram")) {
                drm_err(dev, "can't reserve VRAM\n");