[PATCH xf86-video-amdgpu 4/7] Remove amdpciids.h

[Michel Dänzer]

From: Michel Dänzer <michel.daenzer at amd.com>

Not useful anymore.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 src/Makefile.am  |  1 -
 src/amdgpu_drv.h |  3 +--
 src/amdgpu_kms.c |  4 +---
 src/amdpciids.h  | 39 ---------------------------------------
 4 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 src/amdpciids.h

diff --git a/src/Makefile.am b/src/Makefile.am
index a851b3b..8cc1362 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,7 +68,6 @@ EXTRA_DIST = \
 	amdgpu_version.h \
 	amdgpu_video.h \
 	simple_list.h \
-	amdpciids.h \
 	ati_pciids_gen.h \
 	amdgpu_chipinfo_gen.h \
 	amdgpu_chipset_gen.h \
diff --git a/src/amdgpu_drv.h b/src/amdgpu_drv.h
index 62aa1c1..36cf26a 100644
--- a/src/amdgpu_drv.h
+++ b/src/amdgpu_drv.h
@@ -86,7 +86,6 @@
 #include "compat-api.h"
 
 #include "simple_list.h"
-#include "amdpciids.h"
 
 struct _SyncFence;
 
@@ -191,7 +190,7 @@ struct amdgpu_client_priv {
 
 typedef struct {
 	EntityInfoPtr pEnt;
-	pciVideoPtr PciInfo;
+	struct pci_device *PciInfo;
 	int Chipset;
 	uint32_t family;
 	struct gbm_device *gbm;
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 68570e4..890add5 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -41,8 +41,6 @@
 #include "shadow.h"
 #include <xf86Priv.h>
 
-#include "amdpciids.h"
-
 /* DPMS */
 #ifdef HAVE_XEXTPROTO_71
 #include <X11/extensions/dpmsconst.h>
@@ -1163,7 +1161,7 @@ static Bool AMDGPUPreInitChipType_KMS(ScrnInfoPtr pScrn,
 {
 	AMDGPUInfoPtr info = AMDGPUPTR(pScrn);
 
-	info->Chipset = PCI_DEV_DEVICE_ID(info->PciInfo);
+	info->Chipset = info->PciInfo->device_id;
 	pScrn->chipset =
 	    (char *)xf86TokenToString(AMDGPUChipsets, info->Chipset);
 	if (!pScrn->chipset) {
diff --git a/src/amdpciids.h b/src/amdpciids.h
deleted file mode 100644
index 33ec6da..0000000
--- a/src/amdpciids.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2014 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
-*/
-
-
-#ifndef _AMDPCIIDS_H
-#define _AMDPCIIDS_H
-
-#define PCI_VENDOR_ATI                  0x1002
-
-#include "ati_pciids_gen.h"
-
-typedef struct pci_device *pciVideoPtr;
-
-#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
-
-#define ATI_DEVICE_MATCH(d, i) \
-    { PCI_VENDOR_ATI, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
-
-#endif /* AMDPCIIDS_H */
-- 
2.10.2