From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 25 Oct 2012 01:12:17 +0000 (-0700)
Subject: staging: comedi: addi_common: use PCI_VENDOR_ID_ADDIDATA_OLD
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=64f2f9335915b87373f73cfb47f0a2d9ed190f2b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

staging: comedi: addi_common: use PCI_VENDOR_ID_ADDIDATA_OLD

The kernel provides this id in pci_ids.h. Use it instead of creating
duplicates of the id with different names.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index aaec0ab635d0..b166698c8469 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -144,7 +144,7 @@ void fpu_end(void)
 
 static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
 #ifdef CONFIG_APCI_3120
-	{PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x818D)},
+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x818D)},
 #endif
 #ifdef CONFIG_APCI_1032
 	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003)},
@@ -165,10 +165,10 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
 	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006)},
 #endif
 #ifdef CONFIG_APCI_1500
-	{PCI_DEVICE(APCI1500_BOARD_VENDOR_ID, 0x80fc)},
+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc)},
 #endif
 #ifdef CONFIG_APCI_3001
-	{PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x828D)},
+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x828D)},
 #endif
 #ifdef CONFIG_APCI_3501
 	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001)},
@@ -225,7 +225,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_3120
 	{
 		.pc_DriverName		= "apci3120",
-		.i_VendorId		= APCI3120_BOARD_VENDOR_ID,
+		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,
 		.i_DeviceId		= 0x818D,
 		.i_IorangeBase0		= AMCC_OP_REG_SIZE,
 		.i_IorangeBase1		= APCI3120_ADDRESS_RANGE,
@@ -403,7 +403,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_1500
 	{
 		.pc_DriverName		= "apci1500",
-		.i_VendorId		= APCI1500_BOARD_VENDOR_ID,
+		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,
 		.i_DeviceId		= 0x80fc,
 		.i_IorangeBase0		= 128,
 		.i_IorangeBase1		= APCI1500_ADDRESS_RANGE,
@@ -431,7 +431,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_3001
 	{
 		.pc_DriverName		= "apci3001",
-		.i_VendorId		= APCI3120_BOARD_VENDOR_ID,
+		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,
 		.i_DeviceId		= 0x828D,
 		.i_IorangeBase0		= AMCC_OP_REG_SIZE,
 		.i_IorangeBase1		= APCI3120_ADDRESS_RANGE,
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
index 647f9ebf552a..1f2bd0ff6a90 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
@@ -18,7 +18,6 @@
 /*********      Definitions for APCI-1500 card  *****/
 
 /* Card Specific information */
-#define APCI1500_BOARD_VENDOR_ID           0x10e8
 #define APCI1500_ADDRESS_RANGE              4
 
 /* DIGITAL INPUT-OUTPUT DEFINE */
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
index 50eb0a0a0a05..0cd1e3d867d6 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
@@ -42,7 +42,6 @@ static const struct comedi_lrange range_apci3120_ao = { 2, {
 
 #define APCI3120_BIPOLAR_RANGES	4	/*  used for test on mixture of BIP/UNI ranges */
 
-#define APCI3120_BOARD_VENDOR_ID                 0x10E8
 #define APCI3120_ADDRESS_RANGE            			16
 
 #define APCI3120_DISABLE                         0