From 7425b52e6d9e46c2234b94e4dca280f404454a52 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Mon, 28 Apr 2008 15:57:58 +0000
Subject: [PATCH] Use DEFINE_PCI_DEVICE_TABLE() macro to declare PCI device
 table.

---
 comedi/drivers/adl_pci6208.c    | 2 +-
 comedi/drivers/adl_pci7296.c    | 2 +-
 comedi/drivers/adl_pci7432.c    | 2 +-
 comedi/drivers/adl_pci8164.c    | 2 +-
 comedi/drivers/adl_pci9111.c    | 2 +-
 comedi/drivers/adl_pci9118.c    | 2 +-
 comedi/drivers/adv_pci1710.c    | 2 +-
 comedi/drivers/adv_pci1723.c    | 2 +-
 comedi/drivers/adv_pci_dio.c    | 2 +-
 comedi/drivers/amplc_dio200.c   | 4 ++--
 comedi/drivers/amplc_pc236.c    | 4 ++--
 comedi/drivers/amplc_pc263.c    | 4 ++--
 comedi/drivers/amplc_pci224.c   | 4 ++--
 comedi/drivers/amplc_pci230.c   | 2 +-
 comedi/drivers/cb_pcidas.c      | 2 +-
 comedi/drivers/cb_pcidas64.c    | 2 +-
 comedi/drivers/cb_pcidda.c      | 2 +-
 comedi/drivers/cb_pcidio.c      | 2 +-
 comedi/drivers/cb_pcimdas.c     | 2 +-
 comedi/drivers/cb_pcimdda.c     | 2 +-
 comedi/drivers/contec_pci_dio.c | 2 +-
 comedi/drivers/daqboard2000.c   | 2 +-
 comedi/drivers/das08.c          | 2 +-
 comedi/drivers/dt3000.c         | 2 +-
 comedi/drivers/gsc_hpdi.c       | 2 +-
 comedi/drivers/jr3_pci.c        | 2 +-
 comedi/drivers/ke_counter.c     | 2 +-
 comedi/drivers/me4000.c         | 2 +-
 comedi/drivers/me_daq.c         | 2 +-
 comedi/drivers/ni_6527.c        | 2 +-
 comedi/drivers/ni_65xx.c        | 2 +-
 comedi/drivers/ni_660x.c        | 2 +-
 comedi/drivers/ni_670x.c        | 2 +-
 comedi/drivers/ni_labpc.c       | 2 +-
 comedi/drivers/ni_pcidio.c      | 2 +-
 comedi/drivers/ni_pcimio.c      | 2 +-
 comedi/drivers/rtd520.c         | 2 +-
 comedi/drivers/s626.c           | 2 +-
 comedi/drivers/skel.c           | 2 +-
 39 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/comedi/drivers/adl_pci6208.c b/comedi/drivers/adl_pci6208.c
index f6f3fbfc..2a6eb4da 100644
--- 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 a412198b..c46b2156 100644
--- 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 f60c83c8..ea4e7f71 100644
--- 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 2a4da894..e43c4f92 100644
--- 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 f12638d5..1295185f 100644
--- 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 2596a6f9..8ba859a3 100644
--- 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 81e41559..a456a09b 100644
--- 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 65cc9961..a26fd8bb 100644
--- 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 ee4df23d..37a2e1ba 100644
--- 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 39bfd839..482a3e2a 100644
--- 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 56a9d40a..1f70aa86 100644
--- 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 73d9d6b5..0e41cc01 100644
--- 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 7b1c6ca5..886b340e 100644
--- 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 8590e6e6..47ee16f5 100644
--- 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 87fdda15..e82b7302 100644
--- 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 bfae41c6..f7e21347 100644
--- 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 52da40bd..1902e1aa 100644
--- 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 decc02a4..099a749d 100644
--- 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 f4e5922b..50d80d89 100644
--- 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 76e922bb..4a8733f5 100644
--- 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 250832ee..e3c362d1 100644
--- 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 41cdbe07..e7aefeef 100644
--- 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 252f3289..d239d885 100644
--- 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 75bd0988..3c1f713a 100644
--- 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 84ebe70a..7e27fade 100644
--- 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 6cfdd8c8..5a7266fe 100644
--- 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 edafb066..b13e9a4f 100644
--- 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 3bb1976a..abc9c5d8 100644
--- 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 8c793642..906537f6 100644
--- 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 d3edea30..9de11589 100644
--- 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 ee382aa9..52cd5cc0 100644
--- 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 64459db4..1676b873 100644
--- 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 fba1a2a8..31eb9726 100644
--- 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 b3adc2bc..f33cd250 100644
--- 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 a7ddad18..bc260b8a 100644
--- 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 ed627dcc..3067e1a2 100644
--- 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 711754cc..1daabf78 100644
--- 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 d10ff22e..1bdeec3a 100644
--- 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 db2c9b5a..b0ffcabe 100644
--- 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}
-- 
2.26.2