Commit dc3629ab authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/qxl: Remove references to struct drm_device.pdev 



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

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201201103542.2182-15-tzimmermann@suse.de
parent 0e6aadca

drivers/gpu/drm/qxl/qxl_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ DEFINE_DRM_GEM_FOPS(qxl_fops); 


static int qxl_drm_freeze(struct drm_device *dev)

{

	struct pci_dev *pdev = dev->pdev;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct qxl_device *qdev = to_qxl(dev);

	int ret;

drivers/gpu/drm/qxl/qxl_ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -370,13 +370,14 @@ static int qxl_clientcap_ioctl(struct drm_device *dev, void *data, 
				  struct drm_file *file_priv)

{

	struct qxl_device *qdev = to_qxl(dev);

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct drm_qxl_clientcap *param = data;

	int byte, idx;



	byte = param->index / 8;

	idx = param->index % 8;



	if (dev->pdev->revision < 4)

	if (pdev->revision < 4)

		return -ENOSYS;



	if (byte >= 58)

drivers/gpu/drm/qxl/qxl_irq.c

+2 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static void qxl_client_monitors_config_work_func(struct work_struct *work) 


int qxl_irq_init(struct qxl_device *qdev)

{

	struct pci_dev *pdev = to_pci_dev(qdev->ddev.dev);

	int ret;



	init_waitqueue_head(&qdev->display_event);
@@ -93,7 +94,7 @@ int qxl_irq_init(struct qxl_device *qdev) 
	atomic_set(&qdev->irq_received_cursor, 0);

	atomic_set(&qdev->irq_received_io_cmd, 0);

	qdev->irq_received_error = 0;

	ret = drm_irq_install(&qdev->ddev, qdev->ddev.pdev->irq);

	ret = drm_irq_install(&qdev->ddev, pdev->irq);

	qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;

	if (unlikely(ret != 0)) {

		DRM_ERROR("Failed installing irq: %d\n", ret);

drivers/gpu/drm/qxl/qxl_kms.c

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ int qxl_device_init(struct qxl_device *qdev, 
{

	int r, sb;



	qdev->ddev.pdev = pdev;

	pci_set_drvdata(pdev, &qdev->ddev);



	mutex_init(&qdev->gem.mutex);