Staging: comedi: use the standard NI pci device id

Don't redefine something that we already have in the core
kernel.  Also move to use PCI_DEVICE() macros to make things
a bit simpler when changing the define.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 4e1955b1bf2cbd3b1b9c6c048b5bdf30b1fa43ea..6eba86d3820bf506dc62ab0c02365cf7212c096c 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -110,7 +110,6 @@
        COMEDI_PCI_INITCLEANUP_NOMODULE(comedi_driver, pci_id_table)
 
 #define PCI_VENDOR_ID_INOVA            0x104c
-#define PCI_VENDOR_ID_NATINST          0x1093
 #define PCI_VENDOR_ID_DATX             0x1116
 #define PCI_VENDOR_ID_COMPUTERBOARDS   0x1307
 #define PCI_VENDOR_ID_ADVANTECH                0x13fe

diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c
index 188f58042746ee654dea7fed25aa613b588ef640..99d9985c5b371aeba859e4d8bc270eec6719dc96 100644 (file)
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -76,7 +76,7 @@ void mite_init(void)
        for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
             pcidev != NULL;
             pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
-               if (pcidev->vendor == PCI_VENDOR_ID_NATINST) {
+               if (pcidev->vendor == PCI_VENDOR_ID_NI) {
                        unsigned i;
 
                        mite = kzalloc(sizeof(*mite), GFP_KERNEL);

diff --git a/drivers/staging/comedi/drivers/mite.h b/drivers/staging/comedi/drivers/mite.h
index 9d5049f8fa858a89eb7dfdee555e342fc76560ef..999551f54c2ab3469b7f9c4398404b6c65d9bef2 100644 (file)
--- a/drivers/staging/comedi/drivers/mite.h
+++ b/drivers/staging/comedi/drivers/mite.h
@@ -27,8 +27,6 @@
 #include <linux/pci.h>
 #include "../comedidev.h"
 
-#define PCI_VENDOR_ID_NATINST          0x1093
-
 /*  #define DEBUG_MITE */
 #define PCIMIO_COMPAT
 

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 653b4c8700af6103deada261e2bbb1fcad1644af..1fc76cc6a28eb0d33b1b64fcd26357818502aafe 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -107,10 +107,9 @@ static const struct ni6527_board ni6527_boards[] = {
 #define this_board ((const struct ni6527_board *)dev->board_ptr)
 
 static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = {
-       {
-       PCI_VENDOR_ID_NATINST, 0x2b10, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b10)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b20)},
+       {0}
 };
 
 MODULE_DEVICE_TABLE(pci, ni6527_pci_table);

diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 9a4fffe5655ffb19fcb901a3e44607a13997d3b6..d793f5a4ac988c69a23ecedebcd041941a8c08ba 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -266,30 +266,29 @@ static inline unsigned ni_65xx_total_num_ports(const struct ni_65xx_board
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ni_65xx_pci_table) = {
-       {
-       PCI_VENDOR_ID_NATINST, 0x1710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7085, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7086, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7087, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7088, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70a9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70c3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70c8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70c9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70cc, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70CD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70d1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70d2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70d3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7125, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7126, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7127, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7128, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x718b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x718c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x71c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1710)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7085)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7086)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7087)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7088)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70a9)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c3)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c8)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c9)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70cc)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70CD)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d1)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d2)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d3)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7124)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7125)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7126)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7127)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7128)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x718b)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x718c)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x71c5)},
+       {0}
 };
 
 MODULE_DEVICE_TABLE(pci, ni_65xx_pci_table);

diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 017630fb2424d874503acc335ec8789db8da58f6..6a6fae53ea0b39fcc8d693b2246bddb431258b6b 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -420,12 +420,11 @@ static const struct ni_660x_board ni_660x_boards[] = {
 #define NI_660X_MAX_NUM_COUNTERS (NI_660X_MAX_NUM_CHIPS * counters_per_chip)
 
 static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = {
-       {
-       PCI_VENDOR_ID_NATINST, 0x2c60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2cc0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2c60)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1310)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1360)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2cc0)},
+       {0}
 };
 
 MODULE_DEVICE_TABLE(pci, ni_660x_pci_table);

diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index 68221bfba5dd64bf37051e1f142d67b5aefff304..44ae8368454defbd728fac76146661a8259eefb1 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -47,8 +47,6 @@ Commands are not supported.
 
 #include "mite.h"
 
-#define PCI_VENDOR_ID_NATINST  0x1093
-
 #define AO_VALUE_OFFSET                        0x00
 #define        AO_CHAN_OFFSET                  0x0c
 #define        AO_STATUS_OFFSET                0x10
@@ -91,12 +89,9 @@ static const struct ni_670x_board ni_670x_boards[] = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(ni_670x_pci_table) = {
-       {
-       PCI_VENDOR_ID_NATINST, 0x2c90, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-       /*{ PCI_VENDOR_ID_NATINST, 0x0000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },*/
-       {
-       0}
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2c90)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1920)},
+       {0}
 };
 
 MODULE_DEVICE_TABLE(pci, ni_670x_pci_table);

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 9b840a96bafaba9b1f9651f41230bd6794ec5059..67c8a538802c715bc85926b8d35c752d7caa4f0b 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -499,9 +499,8 @@ static struct comedi_driver driver_labpc = {
 
 #ifdef CONFIG_COMEDI_PCI
 static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = {
-       {
-       PCI_VENDOR_ID_NATINST, 0x161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x161)},
+       {0}
 };
 
 MODULE_DEVICE_TABLE(pci, labpc_pci_table);

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 9d337516409d7cb73811a48b5fa508f96386c7d0..b126638d33b22d57c082fe5c3019083f57a78cac 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -83,8 +83,6 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org
 #define DPRINTK(format, args...)
 #endif
 
-#define PCI_VENDOR_ID_NATINST  0x1093
-
 #define PCI_DIO_SIZE 4096
 #define PCI_MITE_SIZE 4096
 
@@ -379,18 +377,17 @@ static const struct nidio_board nidio_boards[] = {
 #define this_board ((const struct nidio_board *)dev->board_ptr)
 
 static DEFINE_PCI_DEVICE_TABLE(ni_pcidio_pci_table) = {
-       {
-       PCI_VENDOR_ID_NATINST, 0x1150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x12b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x0160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1630, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x13c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x0400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1250, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x17d0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1150)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1320)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x12b0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x0160)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1630)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x13c0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x0400)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1250)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x17d0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1800)},
+       {0}
 };
 
 MODULE_DEVICE_TABLE(pci, ni_pcidio_pci_table);

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 24c8b8ed5b4c4c04e8b9c860f13c7c1dcd5ddb49..577fda84190d858f7c254f20c5d2faed8d5b375c 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -130,60 +130,59 @@ Bugs:
 
 /* The following two tables must be in the same order */
 static DEFINE_PCI_DEVICE_TABLE(ni_pci_table) = {
-       {
-       PCI_VENDOR_ID_NATINST, 0x0162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1170, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1190, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x11b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x11c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x11d0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1270, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1330, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1340, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1350, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x14e0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x14f0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1580, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x15b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x1870, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x18b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x18c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2420, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2430, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2890, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x28c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2a60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2a70, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2a80, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2ab0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2b80, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2b90, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2c80, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x2ca0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70aa, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70ab, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70ac, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70af, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70b4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70b6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70b7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70b8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70bc, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70bd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70bf, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70f2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x710d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x716c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x716d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x717f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x71bc, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x717d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x0162)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1170)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1180)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1190)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x11b0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x11c0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x11d0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1270)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1330)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1340)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1350)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x14e0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x14f0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1580)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x15b0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1880)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1870)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x18b0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x18c0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2410)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2420)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2430)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2890)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x28c0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2a60)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2a70)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2a80)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2ab0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b80)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b90)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2c80)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2ca0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70aa)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70ab)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70ac)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70af)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70b0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70b4)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70b6)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70b7)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70b8)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70bc)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70bd)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70bf)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70f2)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x710d)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x716c)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x716d)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x717f)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x71bc)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x717d)},
+       {0}
 };
 
 MODULE_DEVICE_TABLE(pci, ni_pci_table);