drm: Remove pci_vendor and pci_device from struct drm_device

We can get the PCI vendor and device IDs via dev->pdev. So we can drop
the duplicated information.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index 061b227dae0c..c155d6f3fa68 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -499,7 +499,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev)
         crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL);
         fp2_gen_cntl = 0;
 
-        if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) {
+        if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {
                 fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL);
         }
 
@@ -536,7 +536,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev)
                 (RADEON_CRTC_SYNC_TRISTAT |
                  RADEON_CRTC_DISPLAY_DIS)));
 
-        if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) {
+        if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {
                 WREG32(RADEON_FP2_GEN_CNTL, (fp2_gen_cntl & ~RADEON_FP2_ON));
         }
 
@@ -554,7 +554,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev)
                 WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl);
         }
         WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl);
-        if (rdev->ddev->pci_device == PCI_DEVICE_ID_ATI_RADEON_QY) {
+        if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {
                 WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl);
         }
         return r;
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 61580ddc4eb2..d6b36766e8c9 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -191,7 +191,7 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
 
         switch (info->request) {
         case RADEON_INFO_DEVICE_ID:
-                *value = dev->pci_device;
+                *value = dev->pdev->device;
                 break;
         case RADEON_INFO_NUM_GB_PIPES:
                 *value = rdev->num_gb_pipes;