diff options
author | Gabriel Krisman Bertazi <krisman@collabora.co.uk> | 2017-01-26 20:05:47 -0500 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-02-02 04:02:36 -0500 |
commit | d74d74aeaf0b29a158bc95c63c6b6b107a57f4f5 (patch) | |
tree | 58b1b0bb053014330f5578c017362467dfd8feef | |
parent | 5472bdee3f7ac3393e6911fc21eaa339b978cfed (diff) |
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>
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_ioctl.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_kms.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index a022de205134..05a96dde1916 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h | |||
@@ -243,7 +243,6 @@ struct qxl_device; | |||
243 | 243 | ||
244 | struct qxl_device { | 244 | struct qxl_device { |
245 | struct drm_device *ddev; | 245 | struct drm_device *ddev; |
246 | struct pci_dev *pdev; | ||
247 | unsigned long flags; | 246 | unsigned long flags; |
248 | 247 | ||
249 | resource_size_t vram_base, vram_size; | 248 | 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 5a4c8c492683..7ad5070f2550 100644 --- 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, | |||
375 | byte = param->index / 8; | 375 | byte = param->index / 8; |
376 | idx = param->index % 8; | 376 | idx = param->index % 8; |
377 | 377 | ||
378 | if (qdev->pdev->revision < 4) | 378 | if (dev->pdev->revision < 4) |
379 | return -ENOSYS; | 379 | return -ENOSYS; |
380 | 380 | ||
381 | if (byte >= 58) | 381 | if (byte >= 58) |
diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index 7632e38493fc..52d1bc1bb0ca 100644 --- 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, | |||
123 | int r, sb; | 123 | int r, sb; |
124 | 124 | ||
125 | qdev->ddev = ddev; | 125 | qdev->ddev = ddev; |
126 | qdev->pdev = pdev; | ||
127 | qdev->flags = flags; | 126 | qdev->flags = flags; |
128 | 127 | ||
129 | mutex_init(&qdev->gem.mutex); | 128 | mutex_init(&qdev->gem.mutex); |