Use DEFINE_PCI_DEVICE_TABLE() macro to declare PCI device table.

diff --git a/comedi/drivers/adl_pci6208.c b/comedi/drivers/adl_pci6208.c
index f6f3fbfcbcdef35893437850cff72c26386764a8..2a6eb4dafaae521eec3c2b3ea2b87048475ea04e 100644 (file)
--- a/comedi/drivers/adl_pci6208.c
+++ b/comedi/drivers/adl_pci6208.c
@@ -86,7 +86,7 @@ static const pci6208_board pci6208_boards[] = {
 
 /* This is used by modprobe to translate PCI IDs to drivers.  Should
  * only be used for PCI and ISA-PnP devices */
-static struct pci_device_id pci6208_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pci6208_pci_table) = {
        //{ PCI_VENDOR_ID_ADLINK, 0x6208, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        //{ PCI_VENDOR_ID_ADLINK, 0x6208, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        {PCI_VENDOR_ID_ADLINK, 0x6208, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

diff --git a/comedi/drivers/adl_pci7296.c b/comedi/drivers/adl_pci7296.c
index a412198bdafc2193d579bbe7c33e9d702f17266d..c46b215619c60c886e8370d4dbc314c23081e315 100644 (file)
--- a/comedi/drivers/adl_pci7296.c
+++ b/comedi/drivers/adl_pci7296.c
@@ -58,7 +58,7 @@ static const adl_pci7296_board adl_pci7296_boards[] = {
        {"pci7296", PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296},
 };
 
-static struct pci_device_id adl_pci7296_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(adl_pci7296_pci_table) = {
        {PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296, PCI_ANY_ID, PCI_ANY_ID, 0,
                0, 0},
        {0}

diff --git a/comedi/drivers/adl_pci7432.c b/comedi/drivers/adl_pci7432.c
index f60c83c896d3be538abfa88ab76d51ec978b3aba..ea4e7f7186458db9161fa911e153956acaf273ff 100644 (file)
--- a/comedi/drivers/adl_pci7432.c
+++ b/comedi/drivers/adl_pci7432.c
@@ -53,7 +53,7 @@ static const adl_pci7432_board adl_pci7432_boards[] = {
        {"pci7432", PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432},
 };
 
-static struct pci_device_id adl_pci7432_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(adl_pci7432_pci_table) = {
        {PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432, PCI_ANY_ID, PCI_ANY_ID, 0,
                0, 0},
        {0}

diff --git a/comedi/drivers/adl_pci8164.c b/comedi/drivers/adl_pci8164.c
index 2a4da894be34bc8506fa2fa09fca494dbcda9fb4..e43c4f927c6b3497762368ee31f425a35a428352 100644 (file)
--- a/comedi/drivers/adl_pci8164.c
+++ b/comedi/drivers/adl_pci8164.c
@@ -65,7 +65,7 @@ static const adl_pci8164_board adl_pci8164_boards[] = {
        {"pci8164", PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI8164},
 };
 
-static struct pci_device_id adl_pci8164_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(adl_pci8164_pci_table) = {
        {PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI8164, PCI_ANY_ID, PCI_ANY_ID, 0,
                0, 0},
        {0}

diff --git a/comedi/drivers/adl_pci9111.c b/comedi/drivers/adl_pci9111.c
index f12638d55d7ab06df0a5c91416075aa4f2809527..1295185fb1491f90477544084ce6ba4ba0c99d8f 100644 (file)
--- a/comedi/drivers/adl_pci9111.c
+++ b/comedi/drivers/adl_pci9111.c
@@ -281,7 +281,7 @@ static const comedi_lrange pci9111_hr_ai_range = {
                }
 };
 
-static struct pci_device_id pci9111_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pci9111_pci_table) = {
        {PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0,
                0, 0},
        //{ PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

diff --git a/comedi/drivers/adl_pci9118.c b/comedi/drivers/adl_pci9118.c
index 2596a6f9c8571d01ead77ce7ec97144e80c42cd7..8ba859a3d6ffd8f6dace13da93423c2207f87ec8 100644 (file)
--- a/comedi/drivers/adl_pci9118.c
+++ b/comedi/drivers/adl_pci9118.c
@@ -201,7 +201,7 @@ typedef struct {
 
 } boardtype;
 
-static struct pci_device_id pci9118_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pci9118_pci_table) = {
        {PCI_VENDOR_ID_AMCC, 0x80d9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {0}
 };

diff --git a/comedi/drivers/adv_pci1710.c b/comedi/drivers/adv_pci1710.c
index 81e415594415db9d9f366716294c6d3528756b7d..a456a09b9cfe71a6cefd9ccb87c6cb37f1b70d41 100644 (file)
--- a/comedi/drivers/adv_pci1710.c
+++ b/comedi/drivers/adv_pci1710.c
@@ -204,7 +204,7 @@ typedef struct {
        unsigned int fifo_half_size;    // size of FIFO/2
 } boardtype;
 
-static struct pci_device_id pci1710_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pci1710_pci_table) = {
        {PCI_VENDOR_ID_ADVANTECH, 0x1710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_ADVANTECH, 0x1711, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_ADVANTECH, 0x1713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

diff --git a/comedi/drivers/adv_pci1723.c b/comedi/drivers/adv_pci1723.c
index 65cc996130423e0351fb09521e2cd5b0ad54c0ee..a26fd8bbc90c8829514c26434a7fa7e81e18f0f4 100644 (file)
--- a/comedi/drivers/adv_pci1723.c
+++ b/comedi/drivers/adv_pci1723.c
@@ -130,7 +130,7 @@ static const boardtype boardtypes[] = {
 
 /* This is used by modprobe to translate PCI IDs to drivers.  Should
  * only be used for PCI and ISA-PnP devices */
-static struct pci_device_id pci1723_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pci1723_pci_table) = {
        {PCI_VENDOR_ID_ADVANTECH, 0x1723, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {0}
 };

diff --git a/comedi/drivers/adv_pci_dio.c b/comedi/drivers/adv_pci_dio.c
index ee4df23d4e6e14132ee2a37b7f48e3650b859d66..37a2e1ba8f1f91a689bddf5ca02d5dcc0dbe8445 100644 (file)
--- a/comedi/drivers/adv_pci_dio.c
+++ b/comedi/drivers/adv_pci_dio.c
@@ -206,7 +206,7 @@ typedef struct {
        hw_io_access io_access; // {enum hw_io_access_enum}
 } boardtype;
 
-static struct pci_device_id pci_dio_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pci_dio_pci_table) = {
        {PCI_VENDOR_ID_ADVANTECH, 0x1730, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_ADVANTECH, 0x1733, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_ADVANTECH, 0x1734, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

diff --git a/comedi/drivers/amplc_dio200.c b/comedi/drivers/amplc_dio200.c
index 39bfd839014ceb1df55cffed08f78632e49934ea..482a3e2ad12d1d5065de49d3705c2f6919d28479 100644 (file)
--- a/comedi/drivers/amplc_dio200.c
+++ b/comedi/drivers/amplc_dio200.c
@@ -403,7 +403,7 @@ static const dio200_layout dio200_layouts[] = {
  */
 
 #ifdef CONFIG_COMEDI_PCI
-static struct pci_device_id dio200_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {
        {PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0, pci215_model},
        {PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272,
@@ -483,7 +483,7 @@ dio200_find_pci(comedi_device * dev, int bus, int slot,
        struct pci_dev **pci_dev_p)
 {
        struct pci_dev *pci_dev = NULL;
-       struct pci_device_id *pci_id;
+       const struct pci_device_id *pci_id;
 
        *pci_dev_p = NULL;
 

diff --git a/comedi/drivers/amplc_pc236.c b/comedi/drivers/amplc_pc236.c
index 56a9d40a272a2c088fd5f7bba591dc1d5a03e3d9..1f70aa86be4b744a4e31590db9b100f9eed67f06 100644 (file)
--- a/comedi/drivers/amplc_pc236.c
+++ b/comedi/drivers/amplc_pc236.c
@@ -119,7 +119,7 @@ static const pc236_board pc236_boards[] = {
 };
 
 #ifdef CONFIG_COMEDI_PCI
-static struct pci_device_id pc236_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = {
        {PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236, PCI_ANY_ID,
                PCI_ANY_ID, 0, 0, pci236_model},
        {0}
@@ -193,7 +193,7 @@ static int pc236_attach(comedi_device * dev, comedi_devconfig * it)
 #ifdef CONFIG_COMEDI_PCI
        struct pci_dev *pci_dev = NULL;
        int bus = 0, slot = 0;
-       struct pci_device_id *pci_id;
+       const struct pci_device_id *pci_id;
 #endif
        int share_irq = 0;
        int ret;

diff --git a/comedi/drivers/amplc_pc263.c b/comedi/drivers/amplc_pc263.c
index 73d9d6b5ae09433d4a2a4a4224abf6289fcbf3ba..0e41cc013eb5f19c95353b9a4763fbf5a19b049e 100644 (file)
--- a/comedi/drivers/amplc_pc263.c
+++ b/comedi/drivers/amplc_pc263.c
@@ -88,7 +88,7 @@ static const pc263_board pc263_boards[] = {
 };
 
 #ifdef CONFIG_COMEDI_PCI
-static struct pci_device_id pc263_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pc263_pci_table) = {
        {PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263, PCI_ANY_ID,
                PCI_ANY_ID, 0, 0, pci263_model},
        {0}
@@ -151,7 +151,7 @@ static int pc263_attach(comedi_device * dev, comedi_devconfig * it)
 #ifdef CONFIG_COMEDI_PCI
        struct pci_dev *pci_dev = NULL;
        int bus = 0, slot = 0;
-       struct pci_device_id *pci_id;
+       const struct pci_device_id *pci_id;
 #endif
        int ret;
 

diff --git a/comedi/drivers/amplc_pci224.c b/comedi/drivers/amplc_pci224.c
index 7b1c6ca539b7de4df37bbb0f392734f241b6cc2b..886b340ee0dfa47add91d165adb7866d24e79146 100644 (file)
--- a/comedi/drivers/amplc_pci224.c
+++ b/comedi/drivers/amplc_pci224.c
@@ -370,7 +370,7 @@ static const pci224_board pci224_boards[] = {
  * PCI driver table.
  */
 
-static struct pci_device_id pci224_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pci224_pci_table) = {
        {PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0, pci224_model},
        {PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234,
@@ -1258,7 +1258,7 @@ pci224_find_pci(comedi_device * dev, int bus, int slot,
        struct pci_dev **pci_dev_p)
 {
        struct pci_dev *pci_dev = NULL;
-       struct pci_device_id *pci_id;
+       const struct pci_device_id *pci_id;
 
        *pci_dev_p = NULL;
 

diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c
index 8590e6e661fff649dd3acce8204c78c7aed9183c..47ee16f51e74d20efc641e5fc1405ac880e437f9 100644 (file)
--- a/comedi/drivers/amplc_pci230.c
+++ b/comedi/drivers/amplc_pci230.c
@@ -501,7 +501,7 @@ static const pci230_board pci230_boards[] = {
                },
 };
 
-static struct pci_device_id pci230_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pci230_pci_table) = {
        {PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230, PCI_ANY_ID, PCI_ANY_ID,
                0, 0, 0},
        {PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260, PCI_ANY_ID, PCI_ANY_ID,

diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c
index 87fdda153c5633a1d22d1045e2de012e95e5db1c..e82b7302dcbb5f02573232b69c506de083474a7b 100644 (file)
--- a/comedi/drivers/cb_pcidas.c
+++ b/comedi/drivers/cb_pcidas.c
@@ -377,7 +377,7 @@ static const cb_pcidas_board cb_pcidas_boards[] = {
 // Number of boards in cb_pcidas_boards
 #define N_BOARDS       (sizeof(cb_pcidas_boards) / sizeof(cb_pcidas_board))
 
-static struct pci_device_id cb_pcidas_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(cb_pcidas_pci_table) = {
        {PCI_VENDOR_ID_CB, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_CB, 0x000f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_CB, 0x0010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c
index bfae41c6c6c333175287e4bb6a6831dae5e4b5c3..f7e213477f28ab043a70f853d2fa10776f07af4d 100644 (file)
--- a/comedi/drivers/cb_pcidas64.c
+++ b/comedi/drivers/cb_pcidas64.c
@@ -1019,7 +1019,7 @@ static inline unsigned int num_boards(void)
        return sizeof(pcidas64_boards) / sizeof(pcidas64_board);
 }
 
-static struct pci_device_id pcidas64_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pcidas64_pci_table) = {
        {PCI_VENDOR_ID_COMPUTERBOARDS, 0x001d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_COMPUTERBOARDS, 0x001e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_COMPUTERBOARDS, 0x0035, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

diff --git a/comedi/drivers/cb_pcidda.c b/comedi/drivers/cb_pcidda.c
index 52da40bdba69134094f7bc0ad97f9e35aebbd432..1902e1aadc0a240db67b5cff91683ebd0bd87d97 100644 (file)
--- a/comedi/drivers/cb_pcidda.c
+++ b/comedi/drivers/cb_pcidda.c
@@ -191,7 +191,7 @@ static const cb_pcidda_board cb_pcidda_boards[] = {
                },
 };
 
-static struct pci_device_id cb_pcidda_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(cb_pcidda_pci_table) = {
        {PCI_VENDOR_ID_CB, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_CB, 0x0021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_CB, 0x0022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

diff --git a/comedi/drivers/cb_pcidio.c b/comedi/drivers/cb_pcidio.c
index decc02a4208abf50950e011547ee6d66eff84aec..099a749d8bba762d1e659dfdbd39d3cbca970359 100644 (file)
--- a/comedi/drivers/cb_pcidio.c
+++ b/comedi/drivers/cb_pcidio.c
@@ -86,7 +86,7 @@ static const pcidio_board pcidio_boards[] = {
  * only be used for PCI and ISA-PnP devices */
 /* Please add your PCI vendor ID to comedidev.h, and it will be forwarded
  * upstream. */
-static struct pci_device_id pcidio_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pcidio_pci_table) = {
        {PCI_VENDOR_ID_CB, 0x0028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_CB, 0x0014, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_CB, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

diff --git a/comedi/drivers/cb_pcimdas.c b/comedi/drivers/cb_pcimdas.c
index f4e5922b27b37935585a27cb4e1fb239d120dc89..50d80d8904d08ba12ad069461ffd853bd62446c7 100644 (file)
--- a/comedi/drivers/cb_pcimdas.c
+++ b/comedi/drivers/cb_pcimdas.c
@@ -122,7 +122,7 @@ static const cb_pcimdas_board cb_pcimdas_boards[] = {
 
 /* This is used by modprobe to translate PCI IDs to drivers.  Should
  * only be used for PCI and ISA-PnP devices */
-static struct pci_device_id cb_pcimdas_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(cb_pcimdas_pci_table) = {
        {PCI_VENDOR_ID_COMPUTERBOARDS, 0x0056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {0}
 };

diff --git a/comedi/drivers/cb_pcimdda.c b/comedi/drivers/cb_pcimdda.c
index 76e922bbe7785e509415091459fef73c5cc4a894..4a8733f50453501718dcca475df7ec89dfb2f36c 100644 (file)
--- a/comedi/drivers/cb_pcimdda.c
+++ b/comedi/drivers/cb_pcimdda.c
@@ -144,7 +144,7 @@ static const board boards[] = {
  * only be used for PCI and ISA-PnP devices */
 /* Please add your PCI vendor ID to comedidev.h, and it will be forwarded
  * upstream. */
-static struct pci_device_id pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pci_table) = {
        {PCI_VENDOR_ID_COMPUTERBOARDS, PCI_ID_PCIM_DDA06_16, PCI_ANY_ID,
                PCI_ANY_ID, 0, 0, 0},
        {0}

diff --git a/comedi/drivers/contec_pci_dio.c b/comedi/drivers/contec_pci_dio.c
index 250832ee79dbe47d7c7ebd71e7af32ef4b105359..e3c362d11cf9072af4a78f37e6b5f98bcc2a164b 100644 (file)
--- a/comedi/drivers/contec_pci_dio.c
+++ b/comedi/drivers/contec_pci_dio.c
@@ -56,7 +56,7 @@ static const contec_board contec_boards[] = {
 };
 
 #define PCI_DEVICE_ID_PIO1616L 0x8172
-static struct pci_device_id contec_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(contec_pci_table) = {
        {PCI_VENDOR_ID_CONTEC, PCI_DEVICE_ID_PIO1616L, PCI_ANY_ID, PCI_ANY_ID,
                0, 0, PIO1616L},
        {0}

diff --git a/comedi/drivers/daqboard2000.c b/comedi/drivers/daqboard2000.c
index 41cdbe0786c6aa86cc96911bdd167ea87990ae1c..e7aefeef6d25c51d225764fe5bc51b72b51ddb60 100644 (file)
--- a/comedi/drivers/daqboard2000.c
+++ b/comedi/drivers/daqboard2000.c
@@ -318,7 +318,7 @@ static const boardtype boardtypes[] = {
 #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
 #define this_board ((const boardtype *)dev->board_ptr)
 
-static struct pci_device_id daqboard2000_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(daqboard2000_pci_table) = {
        {0x1616, 0x0409, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {0}
 };

diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c
index 252f3289ae1380fb424ac50c9608cfdd3fc1cedd..d239d885e1dde64fe00cd524196fd04148280f39 100644 (file)
--- a/comedi/drivers/das08.c
+++ b/comedi/drivers/das08.c
@@ -492,7 +492,7 @@ struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS] = {
                },
 };
 
-static struct pci_device_id das08_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(das08_pci_table) = {
        {PCI_VENDOR_ID_COMPUTERBOARDS, PCI_DEVICE_ID_PCIDAS08, PCI_ANY_ID,
                PCI_ANY_ID, 0, 0, 0},
        {0}

diff --git a/comedi/drivers/dt3000.c b/comedi/drivers/dt3000.c
index 75bd0988266f90ae05e7441eada9552339204183..3c1f713a5253becc9df021c66ebb7daeede4143f 100644 (file)
--- a/comedi/drivers/dt3000.c
+++ b/comedi/drivers/dt3000.c
@@ -161,7 +161,7 @@ static const dt3k_boardtype dt3k_boardtypes[] = {
 #define n_dt3k_boards sizeof(dt3k_boardtypes)/sizeof(dt3k_boardtype)
 #define this_board ((const dt3k_boardtype *)dev->board_ptr)
 
-static struct pci_device_id dt3k_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(dt3k_pci_table) = {
        {PCI_VENDOR_ID_DT, 0x0022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_DT, 0x0027, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_DT, 0x0023, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

diff --git a/comedi/drivers/gsc_hpdi.c b/comedi/drivers/gsc_hpdi.c
index 84ebe70a2b606cf519ea4bba95c70018dc6d993a..7e27fade9419674213b2a0b3bb283412da382cfc 100644 (file)
--- a/comedi/drivers/gsc_hpdi.c
+++ b/comedi/drivers/gsc_hpdi.c
@@ -286,7 +286,7 @@ static inline unsigned int num_boards(void)
        return sizeof(hpdi_boards) / sizeof(hpdi_board);
 }
 
-static struct pci_device_id hpdi_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(hpdi_pci_table) = {
        {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9080, PCI_VENDOR_ID_PLX, 0x2400,
                0, 0, 0},
        {0}

diff --git a/comedi/drivers/jr3_pci.c b/comedi/drivers/jr3_pci.c
index 6cfdd8c8f55348d9cfe3efcaf3a3ff9c0fced582..5a7266fe1d2172c027f5f098d73f33393803c8b3 100644 (file)
--- a/comedi/drivers/jr3_pci.c
+++ b/comedi/drivers/jr3_pci.c
@@ -114,7 +114,7 @@ static comedi_driver driver_jr3_pci = {
       detach:jr3_pci_detach,
 };
 
-static struct pci_device_id jr3_pci_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {
        {PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL,

diff --git a/comedi/drivers/ke_counter.c b/comedi/drivers/ke_counter.c
index edafb066f22d514f5aa69da481ae905132646308..b13e9a4f28dd4c2a7e2e8ee3333402e5ebcc0c03 100644 (file)
--- a/comedi/drivers/ke_counter.c
+++ b/comedi/drivers/ke_counter.c
@@ -51,7 +51,7 @@ Kolter Electronic PCI Counter Card.
 static int cnt_attach(comedi_device * dev, comedi_devconfig * it);
 static int cnt_detach(comedi_device * dev);
 
-static struct pci_device_id cnt_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(cnt_pci_table) = {
        {PCI_VENDOR_ID_KOLTER, CNT_CARD_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                0},
        {0}

diff --git a/comedi/drivers/me4000.c b/comedi/drivers/me4000.c
index 3bb1976ad749495d1cfb1f59255eb11f3a9a568f..abc9c5d85213c82b684b70ec71305b2cd74b9684 100644 (file)
--- a/comedi/drivers/me4000.c
+++ b/comedi/drivers/me4000.c
@@ -69,7 +69,7 @@ broken.
   This is used by modprobe to translate PCI IDs to drivers.
   ===========================================================================*/
 
-static struct pci_device_id me4000_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(me4000_pci_table) = {
        {PCI_VENDOR_ID_MEILHAUS, 0x4650, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 
        {PCI_VENDOR_ID_MEILHAUS, 0x4660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

diff --git a/comedi/drivers/me_daq.c b/comedi/drivers/me_daq.c
index 8c793642408dcc4f81311c02ed4ed2648e55636c..906537f64aaf82f24d1e71e8992e68efbbcda246 100644 (file)
--- a/comedi/drivers/me_daq.c
+++ b/comedi/drivers/me_daq.c
@@ -187,7 +187,7 @@ static const comedi_lrange me2600_ao_range = {
                }
 };
 
-static struct pci_device_id me_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(me_pci_table) = {
        {PCI_VENDOR_ID_MEILHAUS, ME2600_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                0},
        {PCI_VENDOR_ID_MEILHAUS, ME2000_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

diff --git a/comedi/drivers/ni_6527.c b/comedi/drivers/ni_6527.c
index d3edea30bb4b7d14a2051c40f84a580427006023..9de115891b4501afa3a53feeeab35400858732dd 100644 (file)
--- a/comedi/drivers/ni_6527.c
+++ b/comedi/drivers/ni_6527.c
@@ -104,7 +104,7 @@ static const ni6527_board ni6527_boards[] = {
 #define n_ni6527_boards (sizeof(ni6527_boards)/sizeof(ni6527_boards[0]))
 #define this_board ((const ni6527_board *)dev->board_ptr)
 
-static struct pci_device_id ni6527_pci_table[] = {
+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}

diff --git a/comedi/drivers/ni_65xx.c b/comedi/drivers/ni_65xx.c
index ee382aa99cef056c1f7a847bf1c4df3a90880e0c..52cd5cc0841e183b2f910fa6508da61dd450fe1b 100644 (file)
--- a/comedi/drivers/ni_65xx.c
+++ b/comedi/drivers/ni_65xx.c
@@ -254,7 +254,7 @@ static inline unsigned ni_65xx_total_num_ports(const ni_65xx_board * board)
        return board->num_dio_ports + board->num_di_ports + board->num_do_ports;
 }
 
-static struct pci_device_id ni_65xx_pci_table[] = {
+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},

diff --git a/comedi/drivers/ni_660x.c b/comedi/drivers/ni_660x.c
index 64459db44b351cb5c75a0ba031a3bc98fffdb541..1676b873d56d61f102425aedd2e4f9cb7a132d3e 100644 (file)
--- a/comedi/drivers/ni_660x.c
+++ b/comedi/drivers/ni_660x.c
@@ -409,7 +409,7 @@ static const ni_660x_board ni_660x_boards[] = {
 #define NI_660X_MAX_NUM_CHIPS 2
 #define NI_660X_MAX_NUM_COUNTERS (NI_660X_MAX_NUM_CHIPS * counters_per_chip)
 
-static struct pci_device_id ni_660x_pci_table[] = {
+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},

diff --git a/comedi/drivers/ni_670x.c b/comedi/drivers/ni_670x.c
index fba1a2a8e72ab0ffdda84f8fa42bff04099c93d5..31eb972665eced1ba80cbbeff892585a34c37a22 100644 (file)
--- a/comedi/drivers/ni_670x.c
+++ b/comedi/drivers/ni_670x.c
@@ -87,7 +87,7 @@ static const ni_670x_board ni_670x_boards[] = {
                },
 };
 
-static struct pci_device_id ni_670x_pci_table[] = {
+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 },

diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index b3adc2bc31a843b0bb719d73ae735356e0ff5585..f33cd250323d4d77c655b46efc9327ecb817d7d2 100644 (file)
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -433,7 +433,7 @@ static comedi_driver driver_labpc = {
 };
 
 #ifdef CONFIG_COMEDI_PCI
-static struct pci_device_id labpc_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = {
        {PCI_VENDOR_ID_NATINST, 0x161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {0}
 };

diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c
index a7ddad1882ac778dc08bb207dce05e04bf5a6b6f..bc260b8ad4e4c6af986f286a4107e8923067bd06 100644 (file)
--- a/comedi/drivers/ni_pcidio.c
+++ b/comedi/drivers/ni_pcidio.c
@@ -374,7 +374,7 @@ static const nidio_board nidio_boards[] = {
 #define n_nidio_boards (sizeof(nidio_boards)/sizeof(nidio_boards[0]))
 #define this_board ((const nidio_board *)dev->board_ptr)
 
-static struct pci_device_id ni_pcidio_pci_table[] = {
+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},

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index ed627dcc3206c8fab73dab10fa2401ee4a98172c..3067e1a29014076e99f6e5453e52f28bf752df41 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -126,7 +126,7 @@ Bugs:
 #define MAX_N_CALDACS (16+16+2)
 
 /* The following two tables must be in the same order */
-static struct pci_device_id ni_pci_table[] = {
+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},

diff --git a/comedi/drivers/rtd520.c b/comedi/drivers/rtd520.c
index 711754cc700cbd86ea4755a5364462930d04c7af..1daabf78860938cc1f5618e40366525132e557e3 100644 (file)
--- a/comedi/drivers/rtd520.c
+++ b/comedi/drivers/rtd520.c
@@ -318,7 +318,7 @@ static const rtdBoard rtd520Boards[] = {
                },
 };
 
-static struct pci_device_id rtd520_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(rtd520_pci_table) = {
        {PCI_VENDOR_ID_RTD, 0x7520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_RTD, 0x4520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {0}

diff --git a/comedi/drivers/s626.c b/comedi/drivers/s626.c
index d10ff22e6d66d41f9488959bbd9f4762b1a5a8fb..1bdeec3a4e251141919623176eb513ff843d3ce1 100644 (file)
--- a/comedi/drivers/s626.c
+++ b/comedi/drivers/s626.c
@@ -110,7 +110,7 @@ static const s626_board s626_boards[] = {
 #define PCI_VENDOR_ID_S626 0x1131
 #define PCI_DEVICE_ID_S626 0x7146
 
-static struct pci_device_id s626_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(s626_pci_table) = {
        {PCI_VENDOR_ID_S626, PCI_DEVICE_ID_S626, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                0},
        {0}

diff --git a/comedi/drivers/skel.c b/comedi/drivers/skel.c
index db2c9b5aa79b478d181b470941e423e7382ce3cb..b0ffcabe74b08c68ecef8c57752770232c31cef1 100644 (file)
--- a/comedi/drivers/skel.c
+++ b/comedi/drivers/skel.c
@@ -114,7 +114,7 @@ static const skel_board skel_boards[] = {
 /* Please add your PCI vendor ID to comedidev.h, and it will be forwarded
  * upstream. */
 #define PCI_VENDOR_ID_SKEL 0xdafe
-static struct pci_device_id skel_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = {
        {PCI_VENDOR_ID_SKEL, 0x0100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {PCI_VENDOR_ID_SKEL, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {0}