staging: comedi: addi_common: use PCI_VENDOR_ID_ADDIDATA

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 5a93fda046322901a57159925eb92991fca5818a..aaec0ab635d0016d99123eb747b95078c9471959 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -147,22 +147,22 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
        {PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x818D)},
 #endif
 #ifdef CONFIG_APCI_1032
-       {PCI_DEVICE(APCI1032_BOARD_VENDOR_ID, 0x1003)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003)},
 #endif
 #ifdef CONFIG_APCI_1516
-       {PCI_DEVICE(APCI1516_BOARD_VENDOR_ID, 0x1001)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1001)},
 #endif
 #ifdef CONFIG_APCI_2016
-       {PCI_DEVICE(APCI2016_BOARD_VENDOR_ID, 0x1002)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1002)},
 #endif
 #ifdef CONFIG_APCI_2032
-       {PCI_DEVICE(APCI2032_BOARD_VENDOR_ID, 0x1004)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1004)},
 #endif
 #ifdef CONFIG_APCI_2200
-       {PCI_DEVICE(APCI2200_BOARD_VENDOR_ID, 0x1005)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1005)},
 #endif
 #ifdef CONFIG_APCI_1564
-       {PCI_DEVICE(APCI1564_BOARD_VENDOR_ID, 0x1006)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006)},
 #endif
 #ifdef CONFIG_APCI_1500
        {PCI_DEVICE(APCI1500_BOARD_VENDOR_ID, 0x80fc)},
@@ -171,16 +171,16 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
        {PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x828D)},
 #endif
 #ifdef CONFIG_APCI_3501
-       {PCI_DEVICE(APCI3501_BOARD_VENDOR_ID, 0x3001)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001)},
 #endif
 #ifdef CONFIG_APCI_035
-       {PCI_DEVICE(APCI035_BOARD_VENDOR_ID,  0x0300)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA,  0x0300)},
 #endif
 #ifdef CONFIG_APCI_3200
-       {PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3000)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3000)},
 #endif
 #ifdef CONFIG_APCI_3300
-       {PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3007)},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3007)},
 #endif
 #ifdef CONFIG_APCI_1710
        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, APCI1710_BOARD_DEVICE_ID)},
@@ -268,7 +268,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_1032
        {
                .pc_DriverName          = "apci1032",
-               .i_VendorId             = APCI1032_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x1003,
                .i_IorangeBase0         = 4,
                .i_IorangeBase1         = APCI1032_ADDRESS_RANGE,
@@ -285,7 +285,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_1516
        {
                .pc_DriverName          = "apci1516",
-               .i_VendorId             = APCI1516_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x1001,
                .i_IorangeBase0         = 128,
                .i_IorangeBase1         = APCI1516_ADDRESS_RANGE,
@@ -309,7 +309,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_2016
        {
                .pc_DriverName          = "apci2016",
-               .i_VendorId             = APCI2016_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x1002,
                .i_IorangeBase0         = 128,
                .i_IorangeBase1         = APCI2016_ADDRESS_RANGE,
@@ -330,7 +330,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_2032
        {
                .pc_DriverName          = "apci2032",
-               .i_VendorId             = APCI2032_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x1004,
                .i_IorangeBase0         = 4,
                .i_IorangeBase1         = APCI2032_ADDRESS_RANGE,
@@ -353,7 +353,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_2200
        {
                .pc_DriverName          = "apci2200",
-               .i_VendorId             = APCI2200_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x1005,
                .i_IorangeBase0         = 4,
                .i_IorangeBase1         = APCI2200_ADDRESS_RANGE,
@@ -376,7 +376,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_1564
        {
                .pc_DriverName          = "apci1564",
-               .i_VendorId             = APCI1564_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x1006,
                .i_IorangeBase0         = 128,
                .i_IorangeBase1         = APCI1564_ADDRESS_RANGE,
@@ -470,7 +470,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_3501
        {
                .pc_DriverName          = "apci3501",
-               .i_VendorId             = APCI3501_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x3001,
                .i_IorangeBase0         = 64,
                .i_IorangeBase1         = APCI3501_ADDRESS_RANGE,
@@ -498,7 +498,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_035
        {
                .pc_DriverName          = "apci035",
-               .i_VendorId             = APCI035_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x0300,
                .i_IorangeBase0         = 127,
                .i_IorangeBase1         = APCI035_ADDRESS_RANGE,
@@ -524,7 +524,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_3200
        {
                .pc_DriverName          = "apci3200",
-               .i_VendorId             = APCI3200_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x3000,
                .i_IorangeBase0         = 128,
                .i_IorangeBase1         = 256,
@@ -560,7 +560,7 @@ static const struct addi_board boardtypes[] = {
        /* Begin JK     .20.10.2004 = APCI-3300 integration */
        {
                .pc_DriverName          = "apci3300",
-               .i_VendorId             = APCI3200_BOARD_VENDOR_ID,
+               .i_VendorId             = PCI_VENDOR_ID_ADDIDATA,
                .i_DeviceId             = 0x3007,
                .i_IorangeBase0         = 128,
                .i_IorangeBase1         = 256,

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
index 3c700c7bf8181452df424119602e070ac1aa8601..5f1f7f1f4e6600c72af6cffe190a87b39dc91889 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
@@ -16,7 +16,6 @@
  */
 
 /* Card Specific information */
-#define APCI035_BOARD_VENDOR_ID                0x15B8
 #define APCI035_ADDRESS_RANGE          255
 
 /* ANALOG INPUT RANGE */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
index 7114acb4bd2bfeb86bff166a8cb5a679631e1057..58d2de4720d58db7a71f68e650f7484b60a9a408 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
@@ -17,7 +17,6 @@
 
 /*********      Definitions for APCI-1032 card  *****/
 
-#define APCI1032_BOARD_VENDOR_ID 0x15B8
 #define APCI1032_ADDRESS_RANGE  20
 /* DIGITAL INPUT DEFINE */
 

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
index 44728293e494d11a36bb4b6765f4ff707b6f9dee..88e86712e816f808fa1953ebb02cdf846afcd6c4 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
@@ -18,7 +18,6 @@
 /*********      Definitions for APCI-1516 card  *****/
 
 /* Card Specific information */
-#define APCI1516_BOARD_VENDOR_ID                 0x15B8
 #define APCI1516_ADDRESS_RANGE                   8
 
 /* DIGITAL INPUT-OUTPUT DEFINE */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
index c91594d56a4266876b5eb084bfd8475679e673c2..aa249e91465c5b338fe17ddccc1bab2cdd44f19a 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
@@ -17,7 +17,6 @@
 
 /*********      Definitions for APCI-1564 card  *****/
 
-#define APCI1564_BOARD_VENDOR_ID                0x15B8
 #define APCI1564_ADDRESS_RANGE                  128
 
 /* DIGITAL INPUT-OUTPUT DEFINE */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
index c42612af0fafa356d5af96d6bf640648d8bb16a9..8792da9029126118810794db247322ef1a905026 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
@@ -16,7 +16,6 @@
  */
 /*********      Definitions for APCI-2016 card  *****/
 
-#define APCI2016_BOARD_VENDOR_ID 0x15B8
 #define APCI2016_ADDRESS_RANGE   8
 
 /* DIGITAL INPUT-OUTPUT DEFINE */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
index ab145e7c940559b7afcc139552958a736cbe015a..6300067969ca4868d53d6ebd9f636d1879c325c1 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
@@ -18,7 +18,6 @@
 /*********      Definitions for APCI-2032 card  *****/
 
 /* Card Specific information */
-#define APCI2032_BOARD_VENDOR_ID                 0x15B8
 #define APCI2032_ADDRESS_RANGE                   63
 
 /* DIGITAL INPUT-OUTPUT DEFINE */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
index 83f42af84b8fdf564eff97b60d899b928fe25f44..c4aaa0b9405722fd18a918badd8b78fe8fa81994 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
@@ -18,7 +18,6 @@
 /*********      Definitions for APCI-2200 card  *****/
 
 /* Card Specific information */
-#define APCI2200_BOARD_VENDOR_ID                 0x15b8
 #define APCI2200_ADDRESS_RANGE                   64
 
 /* DIGITAL INPUT-OUTPUT DEFINE */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
index 812a9c46e119d1b97bc139fdcd9d15544bbf2487..afa7ba304b3d8aab13859814412b908e2e887188 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
@@ -16,7 +16,6 @@
  */
 
 /* Card Specific information */
-#define APCI3200_BOARD_VENDOR_ID                 0x15B8
 /* #define APCI3200_ADDRESS_RANGE                   264 */
 
 int MODULE_NO;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
index 63df635a7b682309461416afdd2b96d114f1edbb..81ba7f0f16c0273ea4947a60b4aa6a11d4f7907f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
@@ -16,7 +16,6 @@
  */
 
 /* Card Specific information */
-#define APCI3501_BOARD_VENDOR_ID                 0x15B8
 #define APCI3501_ADDRESS_RANGE                   255
 
 #define APCI3501_DIGITAL_IP                       0x50