drm/via: Remove references to drm_device.pdev

Replace all references to struct drm_device's pdev field with
an upcast from dev.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210502104953.21768-7-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c
index 5771bb53ce6a51ac8a120bb2997c3433fade337f..e016a4d620905c72cd542b7c08405158eb6a02ca 100644 (file)
--- a/drivers/gpu/drm/via/via_dmablit.c
+++ b/drivers/gpu/drm/via/via_dmablit.c
@@ -494,6 +494,7 @@ via_dmablit_workqueue(struct work_struct *work)
 {
        drm_via_blitq_t *blitq = container_of(work, drm_via_blitq_t, wq);
        struct drm_device *dev = blitq->dev;
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        unsigned long irqsave;
        drm_via_sg_info_t *cur_sg;
        int cur_released;
@@ -520,7 +521,7 @@ via_dmablit_workqueue(struct work_struct *work)
 
                wake_up(&blitq->busy_queue);
 
-               via_free_sg_info(dev->pdev, cur_sg);
+               via_free_sg_info(pdev, cur_sg);
                kfree(cur_sg);
 
                spin_lock_irqsave(&blitq->blit_lock, irqsave);
@@ -540,9 +541,10 @@ via_init_dmablit(struct drm_device *dev)
 {
        int i, j;
        drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private;
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        drm_via_blitq_t *blitq;
 
-       pci_set_master(dev->pdev);
+       pci_set_master(pdev);
 
        for (i = 0; i < VIA_NUM_BLIT_ENGINES; ++i) {
                blitq = dev_priv->blit_queues + i;
@@ -573,6 +575,7 @@ via_init_dmablit(struct drm_device *dev)
 static int
 via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer)
 {
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        int draw = xfer->to_fb;
        int ret = 0;
 
@@ -652,17 +655,17 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli
 
        if (0 != (ret = via_lock_all_dma_pages(vsg, xfer))) {
                DRM_ERROR("Could not lock DMA pages.\n");
-               via_free_sg_info(dev->pdev, vsg);
+               via_free_sg_info(pdev, vsg);
                return ret;
        }
 
-       via_map_blit_for_device(dev->pdev, xfer, vsg, 0);
+       via_map_blit_for_device(pdev, xfer, vsg, 0);
        if (0 != (ret = via_alloc_desc_pages(vsg))) {
                DRM_ERROR("Could not allocate DMA descriptor pages.\n");
-               via_free_sg_info(dev->pdev, vsg);
+               via_free_sg_info(pdev, vsg);
                return ret;
        }
-       via_map_blit_for_device(dev->pdev, xfer, vsg, 1);
+       via_map_blit_for_device(pdev, xfer, vsg, 1);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index 255c5066a939edaf3005c076f4c7ec451885db1d..a9f6b0c11966de611440ee96bb4c22111f879024 100644 (file)
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
@@ -98,6 +98,7 @@ int via_map_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
 int via_driver_load(struct drm_device *dev, unsigned long chipset)
 {
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
        drm_via_private_t *dev_priv;
        int ret = 0;
 
@@ -110,7 +111,7 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)
 
        dev_priv->chipset = chipset;
 
-       pci_set_master(dev->pdev);
+       pci_set_master(pdev);
 
        ret = drm_vblank_init(dev, 1);
        if (ret) {