drm: qxl: Drop duplicated pci_device pointer attribute

qxl_device duplicates the pointer to struct pci_dev, which is not
needed since we already have it in the drm_device structure.  Clean it
up.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170127010548.27970-3-krisman@collabora.co.uk
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index a022de20513495837ecfe6d812c556edf9b8a0c1..05a96dde1916e8117162370b1285d0167b6b73d5 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -243,7 +243,6 @@ struct qxl_device;
 
 struct qxl_device {
        struct drm_device               *ddev;
-       struct pci_dev                  *pdev;
        unsigned long flags;
 
        resource_size_t vram_base, vram_size;

diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
index 5a4c8c492683048156b853b7a88fce4582b51b90..7ad5070f2550e015a37fb7a0766dd5d18b437452 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
@@ -375,7 +375,7 @@ static int qxl_clientcap_ioctl(struct drm_device *dev, void *data,
        byte = param->index / 8;
        idx = param->index % 8;
 
-       if (qdev->pdev->revision < 4)
+       if (dev->pdev->revision < 4)
                return -ENOSYS;
 
        if (byte >= 58)

diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c
index 7632e38493fcbbd05561ec0442f070396d7da9a7..52d1bc1bb0ca4e4018a2a8948e7100a7bd87e16e 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_kms.c
+++ b/drivers/gpu/drm/qxl/qxl_kms.c
@@ -123,7 +123,6 @@ int qxl_device_init(struct qxl_device *qdev,
        int r, sb;
 
        qdev->ddev = ddev;
-       qdev->pdev = pdev;
        qdev->flags = flags;
 
        mutex_init(&qdev->gem.mutex);