[PATCH] comedi: Consistently define pci_device_ids using named initializers
From: Uwe Kleine-König (The Capable Hub)
Date: Thu Apr 30 2026 - 12:55:55 EST
The .driver_data member of the various struct pci_device_id arrays were
initialized by list expressions. This isn't easily readable if you're
not into PCI. Using named initializers is more explicit and thus easier
to parse. Also skip explicit assignments of 0 (which the compiler takes
care of).
The secret plan is to make struct pci_device_id::driver_data an
anonymous union (similar to
https://lore.kernel.org/all/cover.1776579304.git.u.kleine-koenig@xxxxxxxxxxxx/)
and that requires named initializers. But it's also a nice cleanup on
its own.
This change doesn't introduce changes to the compiled pci_device_id
arrays. Tested on x86 and arm64.
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@xxxxxxxxxxxx>
---
Hello,
the mentioned follow-up quest allows to do
PCI_DEVICE_SUB(HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205,
HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID),
- .driver_data = (kernel_ulong_t)HPI_6205,
+ .driver_data_ptr = HPI_6205,
which gets rid of a bunch of casts and so brings a little bit more type
safety. This patch is a preparation for that. (drivers/comedi doesn't
benefit from that though, as driver_data is never a pointer here.)
I assume a single patch for all of drivers/comedi/ is fine. If not
please instruct how I should split the patch. (per driver?)
Best regards
Uwe
drivers/comedi/drivers/8255_pci.c | 32 +++---
drivers/comedi/drivers/addi_apci_1032.c | 4 +-
drivers/comedi/drivers/addi_apci_1500.c | 4 +-
drivers/comedi/drivers/addi_apci_1516.c | 8 +-
drivers/comedi/drivers/addi_apci_1564.c | 4 +-
drivers/comedi/drivers/addi_apci_16xx.c | 6 +-
drivers/comedi/drivers/addi_apci_2032.c | 4 +-
drivers/comedi/drivers/addi_apci_2200.c | 4 +-
drivers/comedi/drivers/addi_apci_3120.c | 6 +-
drivers/comedi/drivers/addi_apci_3501.c | 4 +-
drivers/comedi/drivers/addi_apci_3xxx.c | 52 ++++-----
drivers/comedi/drivers/adl_pci6208.c | 7 +-
drivers/comedi/drivers/adl_pci7250.c | 18 +--
drivers/comedi/drivers/adl_pci7x3x.c | 14 +--
drivers/comedi/drivers/adl_pci8164.c | 4 +-
drivers/comedi/drivers/adl_pci9111.c | 6 +-
drivers/comedi/drivers/adl_pci9118.c | 8 +-
drivers/comedi/drivers/adv_pci1710.c | 62 +++++-----
drivers/comedi/drivers/adv_pci1720.c | 4 +-
drivers/comedi/drivers/adv_pci1723.c | 4 +-
drivers/comedi/drivers/adv_pci1724.c | 4 +-
drivers/comedi/drivers/adv_pci1760.c | 4 +-
drivers/comedi/drivers/adv_pci_dio.c | 30 ++---
drivers/comedi/drivers/amplc_dio200_pci.c | 12 +-
drivers/comedi/drivers/amplc_pci224.c | 6 +-
drivers/comedi/drivers/amplc_pci230.c | 6 +-
drivers/comedi/drivers/amplc_pci236.c | 4 +-
drivers/comedi/drivers/amplc_pci263.c | 4 +-
drivers/comedi/drivers/cb_pcidas.c | 18 +--
drivers/comedi/drivers/cb_pcidas64.c | 44 ++++----
drivers/comedi/drivers/cb_pcidda.c | 14 +--
drivers/comedi/drivers/cb_pcimdas.c | 6 +-
drivers/comedi/drivers/cb_pcimdda.c | 4 +-
drivers/comedi/drivers/contec_pci_dio.c | 4 +-
drivers/comedi/drivers/daqboard2000.c | 10 +-
drivers/comedi/drivers/das08_pci.c | 4 +-
drivers/comedi/drivers/dt3000.c | 16 +--
drivers/comedi/drivers/dyna_pci10xx.c | 4 +-
drivers/comedi/drivers/gsc_hpdi.c | 6 +-
drivers/comedi/drivers/icp_multi.c | 4 +-
drivers/comedi/drivers/jr3_pci.c | 12 +-
drivers/comedi/drivers/ke_counter.c | 4 +-
drivers/comedi/drivers/me4000.c | 28 ++---
drivers/comedi/drivers/me_daq.c | 6 +-
drivers/comedi/drivers/mf6x4.c | 11 +-
drivers/comedi/drivers/ni_6527.c | 6 +-
drivers/comedi/drivers/ni_65xx.c | 46 ++++----
drivers/comedi/drivers/ni_660x.c | 16 +--
drivers/comedi/drivers/ni_670x.c | 8 +-
drivers/comedi/drivers/ni_labpc_pci.c | 4 +-
drivers/comedi/drivers/ni_pcidio.c | 8 +-
drivers/comedi/drivers/ni_pcimio.c | 132 +++++++++++-----------
drivers/comedi/drivers/rtd520.c | 6 +-
drivers/comedi/drivers/s626.c | 6 +-
54 files changed, 381 insertions(+), 371 deletions(-)
diff --git a/drivers/comedi/drivers/8255_pci.c b/drivers/comedi/drivers/8255_pci.c
index 8498cabe4d91..737e4cf45571 100644
--- a/drivers/comedi/drivers/8255_pci.c
+++ b/drivers/comedi/drivers/8255_pci.c
@@ -267,25 +267,25 @@ static int pci_8255_pci_probe(struct pci_dev *dev,
static const struct pci_device_id pci_8255_pci_table[] = {
#ifdef CONFIG_HAS_IOPORT
- { PCI_VDEVICE(ADLINK, 0x7224), BOARD_ADLINK_PCI7224 },
- { PCI_VDEVICE(ADLINK, 0x7248), BOARD_ADLINK_PCI7248 },
- { PCI_VDEVICE(ADLINK, 0x7296), BOARD_ADLINK_PCI7296 },
- { PCI_VDEVICE(CB, 0x0028), BOARD_CB_PCIDIO24 },
- { PCI_VDEVICE(CB, 0x0014), BOARD_CB_PCIDIO24H },
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_CB, 0x000b, 0x0000, 0x0000),
+ { PCI_VDEVICE(ADLINK, 0x7224), .driver_data = BOARD_ADLINK_PCI7224 },
+ { PCI_VDEVICE(ADLINK, 0x7248), .driver_data = BOARD_ADLINK_PCI7248 },
+ { PCI_VDEVICE(ADLINK, 0x7296), .driver_data = BOARD_ADLINK_PCI7296 },
+ { PCI_VDEVICE(CB, 0x0028), .driver_data = BOARD_CB_PCIDIO24 },
+ { PCI_VDEVICE(CB, 0x0014), .driver_data = BOARD_CB_PCIDIO24H },
+ { PCI_VDEVICE_SUB(CB, 0x000b, 0x0000, 0x0000),
.driver_data = BOARD_CB_PCIDIO48H_OLD },
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_CB, 0x000b, PCI_VENDOR_ID_CB, 0x000b),
+ { PCI_VDEVICE_SUB(CB, 0x000b, PCI_VENDOR_ID_CB, 0x000b),
.driver_data = BOARD_CB_PCIDIO48H_NEW },
- { PCI_VDEVICE(CB, 0x0017), BOARD_CB_PCIDIO96H },
+ { PCI_VDEVICE(CB, 0x0017), .driver_data = BOARD_CB_PCIDIO96H },
#endif /* CONFIG_HAS_IOPORT */
- { PCI_VDEVICE(NI, 0x0160), BOARD_NI_PCIDIO96 },
- { PCI_VDEVICE(NI, 0x1630), BOARD_NI_PCIDIO96B },
- { PCI_VDEVICE(NI, 0x13c0), BOARD_NI_PXI6508 },
- { PCI_VDEVICE(NI, 0x0400), BOARD_NI_PCI6503 },
- { PCI_VDEVICE(NI, 0x1250), BOARD_NI_PCI6503B },
- { PCI_VDEVICE(NI, 0x17d0), BOARD_NI_PCI6503X },
- { PCI_VDEVICE(NI, 0x1800), BOARD_NI_PXI_6503 },
- { 0 }
+ { PCI_VDEVICE(NI, 0x0160), .driver_data = BOARD_NI_PCIDIO96 },
+ { PCI_VDEVICE(NI, 0x1630), .driver_data = BOARD_NI_PCIDIO96B },
+ { PCI_VDEVICE(NI, 0x13c0), .driver_data = BOARD_NI_PXI6508 },
+ { PCI_VDEVICE(NI, 0x0400), .driver_data = BOARD_NI_PCI6503 },
+ { PCI_VDEVICE(NI, 0x1250), .driver_data = BOARD_NI_PCI6503B },
+ { PCI_VDEVICE(NI, 0x17d0), .driver_data = BOARD_NI_PCI6503X },
+ { PCI_VDEVICE(NI, 0x1800), .driver_data = BOARD_NI_PXI_6503 },
+ { }
};
MODULE_DEVICE_TABLE(pci, pci_8255_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_1032.c b/drivers/comedi/drivers/addi_apci_1032.c
index 8eec6d9402de..9ca6980705e5 100644
--- a/drivers/comedi/drivers/addi_apci_1032.c
+++ b/drivers/comedi/drivers/addi_apci_1032.c
@@ -378,8 +378,8 @@ static int apci1032_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci1032_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003) },
- { 0 }
+ { PCI_VDEVICE(ADDIDATA, 0x1003) },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci1032_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_1500.c b/drivers/comedi/drivers/addi_apci_1500.c
index c94c78588889..a203e27888e2 100644
--- a/drivers/comedi/drivers/addi_apci_1500.c
+++ b/drivers/comedi/drivers/addi_apci_1500.c
@@ -869,8 +869,8 @@ static int apci1500_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci1500_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_AMCC, 0x80fc) },
- { 0 }
+ { PCI_VDEVICE(AMCC, 0x80fc) },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci1500_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_1516.c b/drivers/comedi/drivers/addi_apci_1516.c
index 3c48b72dad9d..397f06f8858a 100644
--- a/drivers/comedi/drivers/addi_apci_1516.c
+++ b/drivers/comedi/drivers/addi_apci_1516.c
@@ -196,10 +196,10 @@ static int apci1516_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci1516_pci_table[] = {
- { PCI_VDEVICE(ADDIDATA, 0x1000), BOARD_APCI1016 },
- { PCI_VDEVICE(ADDIDATA, 0x1001), BOARD_APCI1516 },
- { PCI_VDEVICE(ADDIDATA, 0x1002), BOARD_APCI2016 },
- { 0 }
+ { PCI_VDEVICE(ADDIDATA, 0x1000), .driver_data = BOARD_APCI1016 },
+ { PCI_VDEVICE(ADDIDATA, 0x1001), .driver_data = BOARD_APCI1516 },
+ { PCI_VDEVICE(ADDIDATA, 0x1002), .driver_data = BOARD_APCI2016 },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci1516_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_1564.c b/drivers/comedi/drivers/addi_apci_1564.c
index 0cd40948bee7..a54df64afc3d 100644
--- a/drivers/comedi/drivers/addi_apci_1564.c
+++ b/drivers/comedi/drivers/addi_apci_1564.c
@@ -802,8 +802,8 @@ static int apci1564_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci1564_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006) },
- { 0 }
+ { PCI_VDEVICE(ADDIDATA, 0x1006) },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci1564_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_16xx.c b/drivers/comedi/drivers/addi_apci_16xx.c
index ec2c321d2431..87d62c65a4d2 100644
--- a/drivers/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/comedi/drivers/addi_apci_16xx.c
@@ -158,9 +158,9 @@ static int apci16xx_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci16xx_pci_table[] = {
- { PCI_VDEVICE(ADDIDATA, 0x1009), BOARD_APCI1648 },
- { PCI_VDEVICE(ADDIDATA, 0x100a), BOARD_APCI1696 },
- { 0 }
+ { PCI_VDEVICE(ADDIDATA, 0x1009), .driver_data = BOARD_APCI1648 },
+ { PCI_VDEVICE(ADDIDATA, 0x100a), .driver_data = BOARD_APCI1696 },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci16xx_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_2032.c b/drivers/comedi/drivers/addi_apci_2032.c
index d0f52d5ece8f..59bc0de4d864 100644
--- a/drivers/comedi/drivers/addi_apci_2032.c
+++ b/drivers/comedi/drivers/addi_apci_2032.c
@@ -312,8 +312,8 @@ static int apci2032_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci2032_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1004) },
- { 0 }
+ { PCI_VDEVICE(ADDIDATA, 0x1004) },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci2032_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_2200.c b/drivers/comedi/drivers/addi_apci_2200.c
index 00378c9dddc8..686f6ec2cbb6 100644
--- a/drivers/comedi/drivers/addi_apci_2200.c
+++ b/drivers/comedi/drivers/addi_apci_2200.c
@@ -125,8 +125,8 @@ static int apci2200_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci2200_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1005) },
- { 0 }
+ { PCI_VDEVICE(ADDIDATA, 0x1005) },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci2200_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_3120.c b/drivers/comedi/drivers/addi_apci_3120.c
index 28a242e69721..049399cf5681 100644
--- a/drivers/comedi/drivers/addi_apci_3120.c
+++ b/drivers/comedi/drivers/addi_apci_3120.c
@@ -1098,9 +1098,9 @@ static int apci3120_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci3120_pci_table[] = {
- { PCI_VDEVICE(AMCC, 0x818d), BOARD_APCI3120 },
- { PCI_VDEVICE(AMCC, 0x828d), BOARD_APCI3001 },
- { 0 }
+ { PCI_VDEVICE(AMCC, 0x818d), .driver_data = BOARD_APCI3120 },
+ { PCI_VDEVICE(AMCC, 0x828d), .driver_data = BOARD_APCI3001 },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci3120_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_3501.c b/drivers/comedi/drivers/addi_apci_3501.c
index ecb5552f1785..3bcf5c067820 100644
--- a/drivers/comedi/drivers/addi_apci_3501.c
+++ b/drivers/comedi/drivers/addi_apci_3501.c
@@ -399,8 +399,8 @@ static int apci3501_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci3501_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001) },
- { 0 }
+ { PCI_VDEVICE(ADDIDATA, 0x3001) },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci3501_pci_table);
diff --git a/drivers/comedi/drivers/addi_apci_3xxx.c b/drivers/comedi/drivers/addi_apci_3xxx.c
index bc72273e6a29..695cce103177 100644
--- a/drivers/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/comedi/drivers/addi_apci_3xxx.c
@@ -918,32 +918,32 @@ static int apci3xxx_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id apci3xxx_pci_table[] = {
- { PCI_VDEVICE(ADDIDATA, 0x3010), BOARD_APCI3000_16 },
- { PCI_VDEVICE(ADDIDATA, 0x300f), BOARD_APCI3000_8 },
- { PCI_VDEVICE(ADDIDATA, 0x300e), BOARD_APCI3000_4 },
- { PCI_VDEVICE(ADDIDATA, 0x3013), BOARD_APCI3006_16 },
- { PCI_VDEVICE(ADDIDATA, 0x3014), BOARD_APCI3006_8 },
- { PCI_VDEVICE(ADDIDATA, 0x3015), BOARD_APCI3006_4 },
- { PCI_VDEVICE(ADDIDATA, 0x3016), BOARD_APCI3010_16 },
- { PCI_VDEVICE(ADDIDATA, 0x3017), BOARD_APCI3010_8 },
- { PCI_VDEVICE(ADDIDATA, 0x3018), BOARD_APCI3010_4 },
- { PCI_VDEVICE(ADDIDATA, 0x3019), BOARD_APCI3016_16 },
- { PCI_VDEVICE(ADDIDATA, 0x301a), BOARD_APCI3016_8 },
- { PCI_VDEVICE(ADDIDATA, 0x301b), BOARD_APCI3016_4 },
- { PCI_VDEVICE(ADDIDATA, 0x301c), BOARD_APCI3100_16_4 },
- { PCI_VDEVICE(ADDIDATA, 0x301d), BOARD_APCI3100_8_4 },
- { PCI_VDEVICE(ADDIDATA, 0x301e), BOARD_APCI3106_16_4 },
- { PCI_VDEVICE(ADDIDATA, 0x301f), BOARD_APCI3106_8_4 },
- { PCI_VDEVICE(ADDIDATA, 0x3020), BOARD_APCI3110_16_4 },
- { PCI_VDEVICE(ADDIDATA, 0x3021), BOARD_APCI3110_8_4 },
- { PCI_VDEVICE(ADDIDATA, 0x3022), BOARD_APCI3116_16_4 },
- { PCI_VDEVICE(ADDIDATA, 0x3023), BOARD_APCI3116_8_4 },
- { PCI_VDEVICE(ADDIDATA, 0x300B), BOARD_APCI3003 },
- { PCI_VDEVICE(ADDIDATA, 0x3002), BOARD_APCI3002_16 },
- { PCI_VDEVICE(ADDIDATA, 0x3003), BOARD_APCI3002_8 },
- { PCI_VDEVICE(ADDIDATA, 0x3004), BOARD_APCI3002_4 },
- { PCI_VDEVICE(ADDIDATA, 0x3024), BOARD_APCI3500 },
- { 0 }
+ { PCI_VDEVICE(ADDIDATA, 0x3010), .driver_data = BOARD_APCI3000_16 },
+ { PCI_VDEVICE(ADDIDATA, 0x300f), .driver_data = BOARD_APCI3000_8 },
+ { PCI_VDEVICE(ADDIDATA, 0x300e), .driver_data = BOARD_APCI3000_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x3013), .driver_data = BOARD_APCI3006_16 },
+ { PCI_VDEVICE(ADDIDATA, 0x3014), .driver_data = BOARD_APCI3006_8 },
+ { PCI_VDEVICE(ADDIDATA, 0x3015), .driver_data = BOARD_APCI3006_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x3016), .driver_data = BOARD_APCI3010_16 },
+ { PCI_VDEVICE(ADDIDATA, 0x3017), .driver_data = BOARD_APCI3010_8 },
+ { PCI_VDEVICE(ADDIDATA, 0x3018), .driver_data = BOARD_APCI3010_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x3019), .driver_data = BOARD_APCI3016_16 },
+ { PCI_VDEVICE(ADDIDATA, 0x301a), .driver_data = BOARD_APCI3016_8 },
+ { PCI_VDEVICE(ADDIDATA, 0x301b), .driver_data = BOARD_APCI3016_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x301c), .driver_data = BOARD_APCI3100_16_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x301d), .driver_data = BOARD_APCI3100_8_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x301e), .driver_data = BOARD_APCI3106_16_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x301f), .driver_data = BOARD_APCI3106_8_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x3020), .driver_data = BOARD_APCI3110_16_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x3021), .driver_data = BOARD_APCI3110_8_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x3022), .driver_data = BOARD_APCI3116_16_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x3023), .driver_data = BOARD_APCI3116_8_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x300B), .driver_data = BOARD_APCI3003 },
+ { PCI_VDEVICE(ADDIDATA, 0x3002), .driver_data = BOARD_APCI3002_16 },
+ { PCI_VDEVICE(ADDIDATA, 0x3003), .driver_data = BOARD_APCI3002_8 },
+ { PCI_VDEVICE(ADDIDATA, 0x3004), .driver_data = BOARD_APCI3002_4 },
+ { PCI_VDEVICE(ADDIDATA, 0x3024), .driver_data = BOARD_APCI3500 },
+ { }
};
MODULE_DEVICE_TABLE(pci, apci3xxx_pci_table);
diff --git a/drivers/comedi/drivers/adl_pci6208.c b/drivers/comedi/drivers/adl_pci6208.c
index b27354a51f5c..57d1af105d41 100644
--- a/drivers/comedi/drivers/adl_pci6208.c
+++ b/drivers/comedi/drivers/adl_pci6208.c
@@ -180,10 +180,9 @@ static int adl_pci6208_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id adl_pci6208_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, 0x6208) },
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
- 0x9999, 0x6208) },
- { 0 }
+ { PCI_VDEVICE(ADLINK, 0x6208) },
+ { PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9050, 0x9999, 0x6208) },
+ { }
};
MODULE_DEVICE_TABLE(pci, adl_pci6208_pci_table);
diff --git a/drivers/comedi/drivers/adl_pci7250.c b/drivers/comedi/drivers/adl_pci7250.c
index 78c85a402435..b2772cf17ad2 100644
--- a/drivers/comedi/drivers/adl_pci7250.c
+++ b/drivers/comedi/drivers/adl_pci7250.c
@@ -194,16 +194,16 @@ static int adl_pci7250_pci_probe(struct pci_dev *dev,
static const struct pci_device_id adl_pci7250_pci_table[] = {
#ifdef CONFIG_HAS_IOPORT
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
- 0x9999, 0x7250) },
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADLINK, 0x7250,
- 0x9999, 0x7250) },
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADLINK, 0x7250,
- PCI_VENDOR_ID_ADLINK, 0x7250) },
+ { PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9050,
+ 0x9999, 0x7250) },
+ { PCI_VDEVICE_SUB(ADLINK, 0x7250,
+ 0x9999, 0x7250) },
+ { PCI_VDEVICE_SUB(ADLINK, 0x7250,
+ PCI_VENDOR_ID_ADLINK, 0x7250) },
#endif
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADLINK, 0x7250,
- PCI_VENDOR_ID_ADLINK, 0x7000) }, /* newer LPCIe-7250 */
- { 0 }
+ { PCI_VDEVICE_SUB(ADLINK, 0x7250,
+ PCI_VENDOR_ID_ADLINK, 0x7000) }, /* newer LPCIe-7250 */
+ { }
};
MODULE_DEVICE_TABLE(pci, adl_pci7250_pci_table);
diff --git a/drivers/comedi/drivers/adl_pci7x3x.c b/drivers/comedi/drivers/adl_pci7x3x.c
index e9f22de9b6f1..3e558a9b2ad7 100644
--- a/drivers/comedi/drivers/adl_pci7x3x.c
+++ b/drivers/comedi/drivers/adl_pci7x3x.c
@@ -518,13 +518,13 @@ static int adl_pci7x3x_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id adl_pci7x3x_pci_table[] = {
- { PCI_VDEVICE(ADLINK, 0x7230), BOARD_PCI7230 },
- { PCI_VDEVICE(ADLINK, 0x7233), BOARD_PCI7233 },
- { PCI_VDEVICE(ADLINK, 0x7234), BOARD_PCI7234 },
- { PCI_VDEVICE(ADLINK, 0x7432), BOARD_PCI7432 },
- { PCI_VDEVICE(ADLINK, 0x7433), BOARD_PCI7433 },
- { PCI_VDEVICE(ADLINK, 0x7434), BOARD_PCI7434 },
- { 0 }
+ { PCI_VDEVICE(ADLINK, 0x7230), .driver_data = BOARD_PCI7230 },
+ { PCI_VDEVICE(ADLINK, 0x7233), .driver_data = BOARD_PCI7233 },
+ { PCI_VDEVICE(ADLINK, 0x7234), .driver_data = BOARD_PCI7234 },
+ { PCI_VDEVICE(ADLINK, 0x7432), .driver_data = BOARD_PCI7432 },
+ { PCI_VDEVICE(ADLINK, 0x7433), .driver_data = BOARD_PCI7433 },
+ { PCI_VDEVICE(ADLINK, 0x7434), .driver_data = BOARD_PCI7434 },
+ { }
};
MODULE_DEVICE_TABLE(pci, adl_pci7x3x_pci_table);
diff --git a/drivers/comedi/drivers/adl_pci8164.c b/drivers/comedi/drivers/adl_pci8164.c
index 0c513a67a264..3b56a307a900 100644
--- a/drivers/comedi/drivers/adl_pci8164.c
+++ b/drivers/comedi/drivers/adl_pci8164.c
@@ -135,8 +135,8 @@ static int adl_pci8164_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id adl_pci8164_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, 0x8164) },
- { 0 }
+ { PCI_VDEVICE(ADLINK, 0x8164) },
+ { }
};
MODULE_DEVICE_TABLE(pci, adl_pci8164_pci_table);
diff --git a/drivers/comedi/drivers/adl_pci9111.c b/drivers/comedi/drivers/adl_pci9111.c
index 086d93f40cb9..7e8e669c21d6 100644
--- a/drivers/comedi/drivers/adl_pci9111.c
+++ b/drivers/comedi/drivers/adl_pci9111.c
@@ -727,9 +727,9 @@ static int pci9111_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id pci9111_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, 0x9111) },
- /* { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID) }, */
- { 0 }
+ { PCI_VDEVICE(ADLINK, 0x9111) },
+ /* { PCI_VDEVICE(ADLINK, PCI9111_HG_DEVICE_ID) }, */
+ { }
};
MODULE_DEVICE_TABLE(pci, pci9111_pci_table);
diff --git a/drivers/comedi/drivers/adl_pci9118.c b/drivers/comedi/drivers/adl_pci9118.c
index 67c663892e48..75c487bb2f5b 100644
--- a/drivers/comedi/drivers/adl_pci9118.c
+++ b/drivers/comedi/drivers/adl_pci9118.c
@@ -1715,10 +1715,10 @@ static int adl_pci9118_pci_probe(struct pci_dev *dev,
/* FIXME: All the supported board types have the same device ID! */
static const struct pci_device_id adl_pci9118_pci_table[] = {
- { PCI_VDEVICE(AMCC, 0x80d9), BOARD_PCI9118DG },
-/* { PCI_VDEVICE(AMCC, 0x80d9), BOARD_PCI9118HG }, */
-/* { PCI_VDEVICE(AMCC, 0x80d9), BOARD_PCI9118HR }, */
- { 0 }
+ { PCI_VDEVICE(AMCC, 0x80d9), .driver_data = BOARD_PCI9118DG },
+/* { PCI_VDEVICE(AMCC, 0x80d9), .driver_data = BOARD_PCI9118HG }, */
+/* { PCI_VDEVICE(AMCC, 0x80d9), .driver_data = BOARD_PCI9118HR }, */
+ { }
};
MODULE_DEVICE_TABLE(pci, adl_pci9118_pci_table);
diff --git a/drivers/comedi/drivers/adv_pci1710.c b/drivers/comedi/drivers/adv_pci1710.c
index c49b0f1f5228..fc749241da41 100644
--- a/drivers/comedi/drivers/adv_pci1710.c
+++ b/drivers/comedi/drivers/adv_pci1710.c
@@ -892,60 +892,66 @@ static int adv_pci1710_pci_probe(struct pci_dev *dev,
static const struct pci_device_id adv_pci1710_pci_table[] = {
{
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050),
.driver_data = BOARD_PCI1710,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0x0000),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0x0000),
.driver_data = BOARD_PCI1710,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0xb100),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0xb100),
.driver_data = BOARD_PCI1710,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0xb200),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0xb200),
.driver_data = BOARD_PCI1710,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0xc100),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0xc100),
.driver_data = BOARD_PCI1710,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0xc200),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0xc200),
.driver_data = BOARD_PCI1710,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710, 0x1000, 0xd100),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710, 0x1000, 0xd100),
.driver_data = BOARD_PCI1710,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0x0002),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0x0002),
.driver_data = BOARD_PCI1710HG,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0xb102),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0xb102),
.driver_data = BOARD_PCI1710HG,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0xb202),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0xb202),
.driver_data = BOARD_PCI1710HG,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0xc102),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0xc102),
.driver_data = BOARD_PCI1710HG,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710,
- PCI_VENDOR_ID_ADVANTECH, 0xc202),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710,
+ PCI_VENDOR_ID_ADVANTECH, 0xc202),
.driver_data = BOARD_PCI1710HG,
}, {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADVANTECH, 0x1710, 0x1000, 0xd102),
+ PCI_VDEVICE_SUB(ADVANTECH, 0x1710, 0x1000, 0xd102),
.driver_data = BOARD_PCI1710HG,
+ }, {
+ PCI_VDEVICE(ADVANTECH, 0x1711),
+ .driver_data = BOARD_PCI1711,
+ }, {
+ PCI_VDEVICE(ADVANTECH, 0x1713),
+ .driver_data = BOARD_PCI1713,
+ }, {
+ PCI_VDEVICE(ADVANTECH, 0x1731),
+ .driver_data = BOARD_PCI1731,
},
- { PCI_VDEVICE(ADVANTECH, 0x1711), BOARD_PCI1711 },
- { PCI_VDEVICE(ADVANTECH, 0x1713), BOARD_PCI1713 },
- { PCI_VDEVICE(ADVANTECH, 0x1731), BOARD_PCI1731 },
- { 0 }
+ { }
};
MODULE_DEVICE_TABLE(pci, adv_pci1710_pci_table);
diff --git a/drivers/comedi/drivers/adv_pci1720.c b/drivers/comedi/drivers/adv_pci1720.c
index 2619591ba301..cc21212c5d52 100644
--- a/drivers/comedi/drivers/adv_pci1720.c
+++ b/drivers/comedi/drivers/adv_pci1720.c
@@ -167,8 +167,8 @@ static int adv_pci1720_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id adv_pci1720_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1720) },
- { 0 }
+ { PCI_VDEVICE(ADVANTECH, 0x1720) },
+ { }
};
MODULE_DEVICE_TABLE(pci, adv_pci1720_pci_table);
diff --git a/drivers/comedi/drivers/adv_pci1723.c b/drivers/comedi/drivers/adv_pci1723.c
index e2aedb152068..e7f55251500c 100644
--- a/drivers/comedi/drivers/adv_pci1723.c
+++ b/drivers/comedi/drivers/adv_pci1723.c
@@ -208,8 +208,8 @@ static int adv_pci1723_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id adv_pci1723_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1723) },
- { 0 }
+ { PCI_VDEVICE(ADVANTECH, 0x1723) },
+ { }
};
MODULE_DEVICE_TABLE(pci, adv_pci1723_pci_table);
diff --git a/drivers/comedi/drivers/adv_pci1724.c b/drivers/comedi/drivers/adv_pci1724.c
index bb43b7deeb56..e736f2bcdb04 100644
--- a/drivers/comedi/drivers/adv_pci1724.c
+++ b/drivers/comedi/drivers/adv_pci1724.c
@@ -189,8 +189,8 @@ static int adv_pci1724_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id adv_pci1724_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1724) },
- { 0 }
+ { PCI_VDEVICE(ADVANTECH, 0x1724) },
+ { }
};
MODULE_DEVICE_TABLE(pci, adv_pci1724_pci_table);
diff --git a/drivers/comedi/drivers/adv_pci1760.c b/drivers/comedi/drivers/adv_pci1760.c
index 27f3890f471d..c9b0600be7f5 100644
--- a/drivers/comedi/drivers/adv_pci1760.c
+++ b/drivers/comedi/drivers/adv_pci1760.c
@@ -405,8 +405,8 @@ static int pci1760_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id pci1760_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1760) },
- { 0 }
+ { PCI_VDEVICE(ADVANTECH, 0x1760) },
+ { }
};
MODULE_DEVICE_TABLE(pci, pci1760_pci_table);
diff --git a/drivers/comedi/drivers/adv_pci_dio.c b/drivers/comedi/drivers/adv_pci_dio.c
index ca8054504760..49e2b2efe46d 100644
--- a/drivers/comedi/drivers/adv_pci_dio.c
+++ b/drivers/comedi/drivers/adv_pci_dio.c
@@ -768,21 +768,21 @@ static int adv_pci_dio_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id adv_pci_dio_pci_table[] = {
- { PCI_VDEVICE(ADVANTECH, 0x1730), TYPE_PCI1730 },
- { PCI_VDEVICE(ADVANTECH, 0x1733), TYPE_PCI1733 },
- { PCI_VDEVICE(ADVANTECH, 0x1734), TYPE_PCI1734 },
- { PCI_VDEVICE(ADVANTECH, 0x1735), TYPE_PCI1735 },
- { PCI_VDEVICE(ADVANTECH, 0x1736), TYPE_PCI1736 },
- { PCI_VDEVICE(ADVANTECH, 0x1739), TYPE_PCI1739 },
- { PCI_VDEVICE(ADVANTECH, 0x1750), TYPE_PCI1750 },
- { PCI_VDEVICE(ADVANTECH, 0x1751), TYPE_PCI1751 },
- { PCI_VDEVICE(ADVANTECH, 0x1752), TYPE_PCI1752 },
- { PCI_VDEVICE(ADVANTECH, 0x1753), TYPE_PCI1753 },
- { PCI_VDEVICE(ADVANTECH, 0x1754), TYPE_PCI1754 },
- { PCI_VDEVICE(ADVANTECH, 0x1756), TYPE_PCI1756 },
- { PCI_VDEVICE(ADVANTECH, 0x1761), TYPE_PCI1761 },
- { PCI_VDEVICE(ADVANTECH, 0x1762), TYPE_PCI1762 },
- { 0 }
+ { PCI_VDEVICE(ADVANTECH, 0x1730), .driver_data = TYPE_PCI1730 },
+ { PCI_VDEVICE(ADVANTECH, 0x1733), .driver_data = TYPE_PCI1733 },
+ { PCI_VDEVICE(ADVANTECH, 0x1734), .driver_data = TYPE_PCI1734 },
+ { PCI_VDEVICE(ADVANTECH, 0x1735), .driver_data = TYPE_PCI1735 },
+ { PCI_VDEVICE(ADVANTECH, 0x1736), .driver_data = TYPE_PCI1736 },
+ { PCI_VDEVICE(ADVANTECH, 0x1739), .driver_data = TYPE_PCI1739 },
+ { PCI_VDEVICE(ADVANTECH, 0x1750), .driver_data = TYPE_PCI1750 },
+ { PCI_VDEVICE(ADVANTECH, 0x1751), .driver_data = TYPE_PCI1751 },
+ { PCI_VDEVICE(ADVANTECH, 0x1752), .driver_data = TYPE_PCI1752 },
+ { PCI_VDEVICE(ADVANTECH, 0x1753), .driver_data = TYPE_PCI1753 },
+ { PCI_VDEVICE(ADVANTECH, 0x1754), .driver_data = TYPE_PCI1754 },
+ { PCI_VDEVICE(ADVANTECH, 0x1756), .driver_data = TYPE_PCI1756 },
+ { PCI_VDEVICE(ADVANTECH, 0x1761), .driver_data = TYPE_PCI1761 },
+ { PCI_VDEVICE(ADVANTECH, 0x1762), .driver_data = TYPE_PCI1762 },
+ { }
};
MODULE_DEVICE_TABLE(pci, adv_pci_dio_pci_table);
diff --git a/drivers/comedi/drivers/amplc_dio200_pci.c b/drivers/comedi/drivers/amplc_dio200_pci.c
index cb5b328a28e3..b057bbdd0063 100644
--- a/drivers/comedi/drivers/amplc_dio200_pci.c
+++ b/drivers/comedi/drivers/amplc_dio200_pci.c
@@ -394,13 +394,13 @@ static struct comedi_driver dio200_pci_comedi_driver = {
static const struct pci_device_id dio200_pci_table[] = {
#ifdef CONFIG_HAS_IOPORT
- { PCI_VDEVICE(AMPLICON, 0x000b), pci215_model },
- { PCI_VDEVICE(AMPLICON, 0x000a), pci272_model },
+ { PCI_VDEVICE(AMPLICON, 0x000b), .driver_data = pci215_model },
+ { PCI_VDEVICE(AMPLICON, 0x000a), .driver_data = pci272_model },
#endif /* CONFIG_HAS_IOPORT */
- { PCI_VDEVICE(AMPLICON, 0x0011), pcie236_model },
- { PCI_VDEVICE(AMPLICON, 0x0012), pcie215_model },
- { PCI_VDEVICE(AMPLICON, 0x0014), pcie296_model },
- {0}
+ { PCI_VDEVICE(AMPLICON, 0x0011), .driver_data = pcie236_model },
+ { PCI_VDEVICE(AMPLICON, 0x0012), .driver_data = pcie215_model },
+ { PCI_VDEVICE(AMPLICON, 0x0014), .driver_data = pcie296_model },
+ { }
};
MODULE_DEVICE_TABLE(pci, dio200_pci_table);
diff --git a/drivers/comedi/drivers/amplc_pci224.c b/drivers/comedi/drivers/amplc_pci224.c
index 1373637c2ca2..55292a28f28c 100644
--- a/drivers/comedi/drivers/amplc_pci224.c
+++ b/drivers/comedi/drivers/amplc_pci224.c
@@ -1122,9 +1122,9 @@ static int amplc_pci224_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id amplc_pci224_pci_table[] = {
- { PCI_VDEVICE(AMPLICON, 0x0007), pci224_model },
- { PCI_VDEVICE(AMPLICON, 0x0008), pci234_model },
- { 0 }
+ { PCI_VDEVICE(AMPLICON, 0x0007), .driver_data = pci224_model },
+ { PCI_VDEVICE(AMPLICON, 0x0008), .driver_data = pci234_model },
+ { }
};
MODULE_DEVICE_TABLE(pci, amplc_pci224_pci_table);
diff --git a/drivers/comedi/drivers/amplc_pci230.c b/drivers/comedi/drivers/amplc_pci230.c
index c74209c2e83a..aa9c502b9429 100644
--- a/drivers/comedi/drivers/amplc_pci230.c
+++ b/drivers/comedi/drivers/amplc_pci230.c
@@ -2554,9 +2554,9 @@ static int amplc_pci230_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id amplc_pci230_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230) },
- { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260) },
- { 0 }
+ { PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_PCI230) },
+ { PCI_VDEVICE(AMPLICON, PCI_DEVICE_ID_PCI260) },
+ { }
};
MODULE_DEVICE_TABLE(pci, amplc_pci230_pci_table);
diff --git a/drivers/comedi/drivers/amplc_pci236.c b/drivers/comedi/drivers/amplc_pci236.c
index 482eb261c333..b5d8c9e8d48a 100644
--- a/drivers/comedi/drivers/amplc_pci236.c
+++ b/drivers/comedi/drivers/amplc_pci236.c
@@ -116,8 +116,8 @@ static struct comedi_driver amplc_pci236_driver = {
};
static const struct pci_device_id pci236_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, 0x0009) },
- { 0 }
+ { PCI_VDEVICE(AMPLICON, 0x0009) },
+ { }
};
MODULE_DEVICE_TABLE(pci, pci236_pci_table);
diff --git a/drivers/comedi/drivers/amplc_pci263.c b/drivers/comedi/drivers/amplc_pci263.c
index 1609665c4b18..5a248bf5a7d2 100644
--- a/drivers/comedi/drivers/amplc_pci263.c
+++ b/drivers/comedi/drivers/amplc_pci263.c
@@ -85,8 +85,8 @@ static struct comedi_driver amplc_pci263_driver = {
};
static const struct pci_device_id pci263_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, 0x000c) },
- {0}
+ { PCI_VDEVICE(AMPLICON, 0x000c) },
+ { }
};
MODULE_DEVICE_TABLE(pci, pci263_pci_table);
diff --git a/drivers/comedi/drivers/cb_pcidas.c b/drivers/comedi/drivers/cb_pcidas.c
index 8bb9b0623869..bb6c32f90221 100644
--- a/drivers/comedi/drivers/cb_pcidas.c
+++ b/drivers/comedi/drivers/cb_pcidas.c
@@ -1474,15 +1474,15 @@ static int cb_pcidas_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id cb_pcidas_pci_table[] = {
- { PCI_VDEVICE(CB, 0x0001), BOARD_PCIDAS1602_16 },
- { PCI_VDEVICE(CB, 0x000f), BOARD_PCIDAS1200 },
- { PCI_VDEVICE(CB, 0x0010), BOARD_PCIDAS1602_12 },
- { PCI_VDEVICE(CB, 0x0019), BOARD_PCIDAS1200_JR },
- { PCI_VDEVICE(CB, 0x001c), BOARD_PCIDAS1602_16_JR },
- { PCI_VDEVICE(CB, 0x004c), BOARD_PCIDAS1000 },
- { PCI_VDEVICE(CB, 0x001a), BOARD_PCIDAS1001 },
- { PCI_VDEVICE(CB, 0x001b), BOARD_PCIDAS1002 },
- { 0 }
+ { PCI_VDEVICE(CB, 0x0001), .driver_data = BOARD_PCIDAS1602_16 },
+ { PCI_VDEVICE(CB, 0x000f), .driver_data = BOARD_PCIDAS1200 },
+ { PCI_VDEVICE(CB, 0x0010), .driver_data = BOARD_PCIDAS1602_12 },
+ { PCI_VDEVICE(CB, 0x0019), .driver_data = BOARD_PCIDAS1200_JR },
+ { PCI_VDEVICE(CB, 0x001c), .driver_data = BOARD_PCIDAS1602_16_JR },
+ { PCI_VDEVICE(CB, 0x004c), .driver_data = BOARD_PCIDAS1000 },
+ { PCI_VDEVICE(CB, 0x001a), .driver_data = BOARD_PCIDAS1001 },
+ { PCI_VDEVICE(CB, 0x001b), .driver_data = BOARD_PCIDAS1002 },
+ { }
};
MODULE_DEVICE_TABLE(pci, cb_pcidas_pci_table);
diff --git a/drivers/comedi/drivers/cb_pcidas64.c b/drivers/comedi/drivers/cb_pcidas64.c
index d398c6df9482..549caadc2e8d 100644
--- a/drivers/comedi/drivers/cb_pcidas64.c
+++ b/drivers/comedi/drivers/cb_pcidas64.c
@@ -4074,28 +4074,28 @@ static int cb_pcidas64_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id cb_pcidas64_pci_table[] = {
- { PCI_VDEVICE(CB, 0x001d), BOARD_PCIDAS6402_16 },
- { PCI_VDEVICE(CB, 0x001e), BOARD_PCIDAS6402_12 },
- { PCI_VDEVICE(CB, 0x0035), BOARD_PCIDAS64_M1_16 },
- { PCI_VDEVICE(CB, 0x0036), BOARD_PCIDAS64_M2_16 },
- { PCI_VDEVICE(CB, 0x0037), BOARD_PCIDAS64_M3_16 },
- { PCI_VDEVICE(CB, 0x0052), BOARD_PCIDAS4020_12 },
- { PCI_VDEVICE(CB, 0x005d), BOARD_PCIDAS6023 },
- { PCI_VDEVICE(CB, 0x005e), BOARD_PCIDAS6025 },
- { PCI_VDEVICE(CB, 0x005f), BOARD_PCIDAS6030 },
- { PCI_VDEVICE(CB, 0x0060), BOARD_PCIDAS6031 },
- { PCI_VDEVICE(CB, 0x0061), BOARD_PCIDAS6032 },
- { PCI_VDEVICE(CB, 0x0062), BOARD_PCIDAS6033 },
- { PCI_VDEVICE(CB, 0x0063), BOARD_PCIDAS6034 },
- { PCI_VDEVICE(CB, 0x0064), BOARD_PCIDAS6035 },
- { PCI_VDEVICE(CB, 0x0065), BOARD_PCIDAS6040 },
- { PCI_VDEVICE(CB, 0x0066), BOARD_PCIDAS6052 },
- { PCI_VDEVICE(CB, 0x0067), BOARD_PCIDAS6070 },
- { PCI_VDEVICE(CB, 0x0068), BOARD_PCIDAS6071 },
- { PCI_VDEVICE(CB, 0x006f), BOARD_PCIDAS6036 },
- { PCI_VDEVICE(CB, 0x0078), BOARD_PCIDAS6013 },
- { PCI_VDEVICE(CB, 0x0079), BOARD_PCIDAS6014 },
- { 0 }
+ { PCI_VDEVICE(CB, 0x001d), .driver_data = BOARD_PCIDAS6402_16 },
+ { PCI_VDEVICE(CB, 0x001e), .driver_data = BOARD_PCIDAS6402_12 },
+ { PCI_VDEVICE(CB, 0x0035), .driver_data = BOARD_PCIDAS64_M1_16 },
+ { PCI_VDEVICE(CB, 0x0036), .driver_data = BOARD_PCIDAS64_M2_16 },
+ { PCI_VDEVICE(CB, 0x0037), .driver_data = BOARD_PCIDAS64_M3_16 },
+ { PCI_VDEVICE(CB, 0x0052), .driver_data = BOARD_PCIDAS4020_12 },
+ { PCI_VDEVICE(CB, 0x005d), .driver_data = BOARD_PCIDAS6023 },
+ { PCI_VDEVICE(CB, 0x005e), .driver_data = BOARD_PCIDAS6025 },
+ { PCI_VDEVICE(CB, 0x005f), .driver_data = BOARD_PCIDAS6030 },
+ { PCI_VDEVICE(CB, 0x0060), .driver_data = BOARD_PCIDAS6031 },
+ { PCI_VDEVICE(CB, 0x0061), .driver_data = BOARD_PCIDAS6032 },
+ { PCI_VDEVICE(CB, 0x0062), .driver_data = BOARD_PCIDAS6033 },
+ { PCI_VDEVICE(CB, 0x0063), .driver_data = BOARD_PCIDAS6034 },
+ { PCI_VDEVICE(CB, 0x0064), .driver_data = BOARD_PCIDAS6035 },
+ { PCI_VDEVICE(CB, 0x0065), .driver_data = BOARD_PCIDAS6040 },
+ { PCI_VDEVICE(CB, 0x0066), .driver_data = BOARD_PCIDAS6052 },
+ { PCI_VDEVICE(CB, 0x0067), .driver_data = BOARD_PCIDAS6070 },
+ { PCI_VDEVICE(CB, 0x0068), .driver_data = BOARD_PCIDAS6071 },
+ { PCI_VDEVICE(CB, 0x006f), .driver_data = BOARD_PCIDAS6036 },
+ { PCI_VDEVICE(CB, 0x0078), .driver_data = BOARD_PCIDAS6013 },
+ { PCI_VDEVICE(CB, 0x0079), .driver_data = BOARD_PCIDAS6014 },
+ { }
};
MODULE_DEVICE_TABLE(pci, cb_pcidas64_pci_table);
diff --git a/drivers/comedi/drivers/cb_pcidda.c b/drivers/comedi/drivers/cb_pcidda.c
index c353d0f87da9..31f368e7c9df 100644
--- a/drivers/comedi/drivers/cb_pcidda.c
+++ b/drivers/comedi/drivers/cb_pcidda.c
@@ -396,13 +396,13 @@ static int cb_pcidda_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id cb_pcidda_pci_table[] = {
- { PCI_VDEVICE(CB, 0x0020), BOARD_DDA02_12 },
- { PCI_VDEVICE(CB, 0x0021), BOARD_DDA04_12 },
- { PCI_VDEVICE(CB, 0x0022), BOARD_DDA08_12 },
- { PCI_VDEVICE(CB, 0x0023), BOARD_DDA02_16 },
- { PCI_VDEVICE(CB, 0x0024), BOARD_DDA04_16 },
- { PCI_VDEVICE(CB, 0x0025), BOARD_DDA08_16 },
- { 0 }
+ { PCI_VDEVICE(CB, 0x0020), .driver_data = BOARD_DDA02_12 },
+ { PCI_VDEVICE(CB, 0x0021), .driver_data = BOARD_DDA04_12 },
+ { PCI_VDEVICE(CB, 0x0022), .driver_data = BOARD_DDA08_12 },
+ { PCI_VDEVICE(CB, 0x0023), .driver_data = BOARD_DDA02_16 },
+ { PCI_VDEVICE(CB, 0x0024), .driver_data = BOARD_DDA04_16 },
+ { PCI_VDEVICE(CB, 0x0025), .driver_data = BOARD_DDA08_16 },
+ { }
};
MODULE_DEVICE_TABLE(pci, cb_pcidda_pci_table);
diff --git a/drivers/comedi/drivers/cb_pcimdas.c b/drivers/comedi/drivers/cb_pcimdas.c
index 641c30df392e..ae25347d8375 100644
--- a/drivers/comedi/drivers/cb_pcimdas.c
+++ b/drivers/comedi/drivers/cb_pcimdas.c
@@ -455,9 +455,9 @@ static int cb_pcimdas_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id cb_pcimdas_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) }, /* PCIM-DAS1602/16 */
- { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0115) }, /* PCIe-DAS1602/16 */
- { 0 }
+ { PCI_VDEVICE(CB, 0x0056) }, /* PCIM-DAS1602/16 */
+ { PCI_VDEVICE(CB, 0x0115) }, /* PCIe-DAS1602/16 */
+ { }
};
MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);
diff --git a/drivers/comedi/drivers/cb_pcimdda.c b/drivers/comedi/drivers/cb_pcimdda.c
index 541b5742bb1b..2f270b044b38 100644
--- a/drivers/comedi/drivers/cb_pcimdda.c
+++ b/drivers/comedi/drivers/cb_pcimdda.c
@@ -172,8 +172,8 @@ static int cb_pcimdda_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id cb_pcimdda_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_ID_PCIM_DDA06_16) },
- { 0 }
+ { PCI_VDEVICE(CB, PCI_ID_PCIM_DDA06_16) },
+ { }
};
MODULE_DEVICE_TABLE(pci, cb_pcimdda_pci_table);
diff --git a/drivers/comedi/drivers/contec_pci_dio.c b/drivers/comedi/drivers/contec_pci_dio.c
index 41d42ff14144..56b11a280b20 100644
--- a/drivers/comedi/drivers/contec_pci_dio.c
+++ b/drivers/comedi/drivers/contec_pci_dio.c
@@ -98,8 +98,8 @@ static int contec_pci_dio_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id contec_pci_dio_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_CONTEC, 0x8172) },
- { 0 }
+ { PCI_VDEVICE(CONTEC, 0x8172) },
+ { }
};
MODULE_DEVICE_TABLE(pci, contec_pci_dio_pci_table);
diff --git a/drivers/comedi/drivers/daqboard2000.c b/drivers/comedi/drivers/daqboard2000.c
index 897bf46b95ee..f05b8d3afc54 100644
--- a/drivers/comedi/drivers/daqboard2000.c
+++ b/drivers/comedi/drivers/daqboard2000.c
@@ -764,11 +764,11 @@ static int db2k_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
}
static const struct pci_device_id db2k_pci_table[] = {
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_IOTECH, 0x0409, PCI_VENDOR_ID_IOTECH,
- 0x0002), .driver_data = BOARD_DAQBOARD2000, },
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_IOTECH, 0x0409, PCI_VENDOR_ID_IOTECH,
- 0x0004), .driver_data = BOARD_DAQBOARD2001, },
- { 0 }
+ { PCI_VDEVICE_SUB(IOTECH, 0x0409, PCI_VENDOR_ID_IOTECH, 0x0002),
+ .driver_data = BOARD_DAQBOARD2000 },
+ { PCI_VDEVICE_SUB(IOTECH, 0x0409, PCI_VENDOR_ID_IOTECH, 0x0004),
+ .driver_data = BOARD_DAQBOARD2001 },
+ { }
};
MODULE_DEVICE_TABLE(pci, db2k_pci_table);
diff --git a/drivers/comedi/drivers/das08_pci.c b/drivers/comedi/drivers/das08_pci.c
index 982f3ab0ccbd..a439e0ddbb6d 100644
--- a/drivers/comedi/drivers/das08_pci.c
+++ b/drivers/comedi/drivers/das08_pci.c
@@ -77,8 +77,8 @@ static int das08_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id das08_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0029) },
- { 0 }
+ { PCI_VDEVICE(CB, 0x0029) },
+ { }
};
MODULE_DEVICE_TABLE(pci, das08_pci_table);
diff --git a/drivers/comedi/drivers/dt3000.c b/drivers/comedi/drivers/dt3000.c
index fc6e9c30e522..198aaf812747 100644
--- a/drivers/comedi/drivers/dt3000.c
+++ b/drivers/comedi/drivers/dt3000.c
@@ -715,14 +715,14 @@ static int dt3000_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id dt3000_pci_table[] = {
- { PCI_VDEVICE(DT, 0x0022), BOARD_DT3001 },
- { PCI_VDEVICE(DT, 0x0023), BOARD_DT3002 },
- { PCI_VDEVICE(DT, 0x0024), BOARD_DT3003 },
- { PCI_VDEVICE(DT, 0x0025), BOARD_DT3004 },
- { PCI_VDEVICE(DT, 0x0026), BOARD_DT3005 },
- { PCI_VDEVICE(DT, 0x0027), BOARD_DT3001_PGL },
- { PCI_VDEVICE(DT, 0x0028), BOARD_DT3003_PGL },
- { 0 }
+ { PCI_VDEVICE(DT, 0x0022), .driver_data = BOARD_DT3001 },
+ { PCI_VDEVICE(DT, 0x0023), .driver_data = BOARD_DT3002 },
+ { PCI_VDEVICE(DT, 0x0024), .driver_data = BOARD_DT3003 },
+ { PCI_VDEVICE(DT, 0x0025), .driver_data = BOARD_DT3004 },
+ { PCI_VDEVICE(DT, 0x0026), .driver_data = BOARD_DT3005 },
+ { PCI_VDEVICE(DT, 0x0027), .driver_data = BOARD_DT3001_PGL },
+ { PCI_VDEVICE(DT, 0x0028), .driver_data = BOARD_DT3003_PGL },
+ { }
};
MODULE_DEVICE_TABLE(pci, dt3000_pci_table);
diff --git a/drivers/comedi/drivers/dyna_pci10xx.c b/drivers/comedi/drivers/dyna_pci10xx.c
index 407a038fb3e0..3b11bbf50648 100644
--- a/drivers/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/comedi/drivers/dyna_pci10xx.c
@@ -246,8 +246,8 @@ static int dyna_pci10xx_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id dyna_pci10xx_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_PLX, 0x1050) },
- { 0 }
+ { PCI_VDEVICE(PLX, 0x1050) },
+ { }
};
MODULE_DEVICE_TABLE(pci, dyna_pci10xx_pci_table);
diff --git a/drivers/comedi/drivers/gsc_hpdi.c b/drivers/comedi/drivers/gsc_hpdi.c
index c09d135df38d..b71abefabd96 100644
--- a/drivers/comedi/drivers/gsc_hpdi.c
+++ b/drivers/comedi/drivers/gsc_hpdi.c
@@ -703,9 +703,9 @@ static int gsc_hpdi_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id gsc_hpdi_pci_table[] = {
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9080,
- PCI_VENDOR_ID_PLX, 0x2400) },
- { 0 }
+ { PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9080,
+ PCI_VENDOR_ID_PLX, 0x2400) },
+ { }
};
MODULE_DEVICE_TABLE(pci, gsc_hpdi_pci_table);
diff --git a/drivers/comedi/drivers/icp_multi.c b/drivers/comedi/drivers/icp_multi.c
index ac4b11dbd741..2abee92bfae4 100644
--- a/drivers/comedi/drivers/icp_multi.c
+++ b/drivers/comedi/drivers/icp_multi.c
@@ -317,8 +317,8 @@ static int icp_multi_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id icp_multi_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_ICP, 0x8000) },
- { 0 }
+ { PCI_VDEVICE(ICP, 0x8000) },
+ { }
};
MODULE_DEVICE_TABLE(pci, icp_multi_pci_table);
diff --git a/drivers/comedi/drivers/jr3_pci.c b/drivers/comedi/drivers/jr3_pci.c
index 51287cbc3e48..603e57dd2f13 100644
--- a/drivers/comedi/drivers/jr3_pci.c
+++ b/drivers/comedi/drivers/jr3_pci.c
@@ -779,12 +779,12 @@ static int jr3_pci_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id jr3_pci_pci_table[] = {
- { PCI_VDEVICE(JR3, 0x1111), BOARD_JR3_1 },
- { PCI_VDEVICE(JR3, 0x3111), BOARD_JR3_1 },
- { PCI_VDEVICE(JR3, 0x3112), BOARD_JR3_2 },
- { PCI_VDEVICE(JR3, 0x3113), BOARD_JR3_3 },
- { PCI_VDEVICE(JR3, 0x3114), BOARD_JR3_4 },
- { 0 }
+ { PCI_VDEVICE(JR3, 0x1111), .driver_data = BOARD_JR3_1 },
+ { PCI_VDEVICE(JR3, 0x3111), .driver_data = BOARD_JR3_1 },
+ { PCI_VDEVICE(JR3, 0x3112), .driver_data = BOARD_JR3_2 },
+ { PCI_VDEVICE(JR3, 0x3113), .driver_data = BOARD_JR3_3 },
+ { PCI_VDEVICE(JR3, 0x3114), .driver_data = BOARD_JR3_4 },
+ { }
};
MODULE_DEVICE_TABLE(pci, jr3_pci_pci_table);
diff --git a/drivers/comedi/drivers/ke_counter.c b/drivers/comedi/drivers/ke_counter.c
index b825cf60e1e0..40177ffc904d 100644
--- a/drivers/comedi/drivers/ke_counter.c
+++ b/drivers/comedi/drivers/ke_counter.c
@@ -213,8 +213,8 @@ static int ke_counter_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id ke_counter_pci_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_KOLTER, 0x0014) },
- { 0 }
+ { PCI_VDEVICE(KOLTER, 0x0014) },
+ { }
};
MODULE_DEVICE_TABLE(pci, ke_counter_pci_table);
diff --git a/drivers/comedi/drivers/me4000.c b/drivers/comedi/drivers/me4000.c
index effe9fdbbafe..e62f6e5eca3d 100644
--- a/drivers/comedi/drivers/me4000.c
+++ b/drivers/comedi/drivers/me4000.c
@@ -1254,20 +1254,20 @@ static int me4000_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id me4000_pci_table[] = {
- { PCI_VDEVICE(MEILHAUS, 0x4650), BOARD_ME4650 },
- { PCI_VDEVICE(MEILHAUS, 0x4660), BOARD_ME4660 },
- { PCI_VDEVICE(MEILHAUS, 0x4661), BOARD_ME4660I },
- { PCI_VDEVICE(MEILHAUS, 0x4662), BOARD_ME4660S },
- { PCI_VDEVICE(MEILHAUS, 0x4663), BOARD_ME4660IS },
- { PCI_VDEVICE(MEILHAUS, 0x4670), BOARD_ME4670 },
- { PCI_VDEVICE(MEILHAUS, 0x4671), BOARD_ME4670I },
- { PCI_VDEVICE(MEILHAUS, 0x4672), BOARD_ME4670S },
- { PCI_VDEVICE(MEILHAUS, 0x4673), BOARD_ME4670IS },
- { PCI_VDEVICE(MEILHAUS, 0x4680), BOARD_ME4680 },
- { PCI_VDEVICE(MEILHAUS, 0x4681), BOARD_ME4680I },
- { PCI_VDEVICE(MEILHAUS, 0x4682), BOARD_ME4680S },
- { PCI_VDEVICE(MEILHAUS, 0x4683), BOARD_ME4680IS },
- { 0 }
+ { PCI_VDEVICE(MEILHAUS, 0x4650), .driver_data = BOARD_ME4650 },
+ { PCI_VDEVICE(MEILHAUS, 0x4660), .driver_data = BOARD_ME4660 },
+ { PCI_VDEVICE(MEILHAUS, 0x4661), .driver_data = BOARD_ME4660I },
+ { PCI_VDEVICE(MEILHAUS, 0x4662), .driver_data = BOARD_ME4660S },
+ { PCI_VDEVICE(MEILHAUS, 0x4663), .driver_data = BOARD_ME4660IS },
+ { PCI_VDEVICE(MEILHAUS, 0x4670), .driver_data = BOARD_ME4670 },
+ { PCI_VDEVICE(MEILHAUS, 0x4671), .driver_data = BOARD_ME4670I },
+ { PCI_VDEVICE(MEILHAUS, 0x4672), .driver_data = BOARD_ME4670S },
+ { PCI_VDEVICE(MEILHAUS, 0x4673), .driver_data = BOARD_ME4670IS },
+ { PCI_VDEVICE(MEILHAUS, 0x4680), .driver_data = BOARD_ME4680 },
+ { PCI_VDEVICE(MEILHAUS, 0x4681), .driver_data = BOARD_ME4680I },
+ { PCI_VDEVICE(MEILHAUS, 0x4682), .driver_data = BOARD_ME4680S },
+ { PCI_VDEVICE(MEILHAUS, 0x4683), .driver_data = BOARD_ME4680IS },
+ { }
};
MODULE_DEVICE_TABLE(pci, me4000_pci_table);
diff --git a/drivers/comedi/drivers/me_daq.c b/drivers/comedi/drivers/me_daq.c
index 2f2ea029cffc..ff8699620ec2 100644
--- a/drivers/comedi/drivers/me_daq.c
+++ b/drivers/comedi/drivers/me_daq.c
@@ -538,9 +538,9 @@ static int me_daq_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id me_daq_pci_table[] = {
- { PCI_VDEVICE(MEILHAUS, 0x2600), BOARD_ME2600 },
- { PCI_VDEVICE(MEILHAUS, 0x2000), BOARD_ME2000 },
- { 0 }
+ { PCI_VDEVICE(MEILHAUS, 0x2600), .driver_data = BOARD_ME2600 },
+ { PCI_VDEVICE(MEILHAUS, 0x2000), .driver_data = BOARD_ME2000 },
+ { }
};
MODULE_DEVICE_TABLE(pci, me_daq_pci_table);
diff --git a/drivers/comedi/drivers/mf6x4.c b/drivers/comedi/drivers/mf6x4.c
index 14f1d5e9cd59..0e63c374bc3b 100644
--- a/drivers/comedi/drivers/mf6x4.c
+++ b/drivers/comedi/drivers/mf6x4.c
@@ -290,9 +290,14 @@ static int mf6x4_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
}
static const struct pci_device_id mf6x4_pci_table[] = {
- { PCI_VDEVICE(HUMUSOFT, 0x0634), BOARD_MF634 },
- { PCI_VDEVICE(HUMUSOFT, 0x0624), BOARD_MF624 },
- { 0 }
+ {
+ PCI_VDEVICE(HUMUSOFT, 0x0634),
+ .driver_data = BOARD_MF634,
+ }, {
+ PCI_VDEVICE(HUMUSOFT, 0x0624),
+ .driver_data = BOARD_MF624,
+ },
+ { }
};
MODULE_DEVICE_TABLE(pci, mf6x4_pci_table);
diff --git a/drivers/comedi/drivers/ni_6527.c b/drivers/comedi/drivers/ni_6527.c
index ac5820085231..8c0d27c7f8a9 100644
--- a/drivers/comedi/drivers/ni_6527.c
+++ b/drivers/comedi/drivers/ni_6527.c
@@ -473,9 +473,9 @@ static int ni6527_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id ni6527_pci_table[] = {
- { PCI_VDEVICE(NI, 0x2b10), BOARD_PXI6527 },
- { PCI_VDEVICE(NI, 0x2b20), BOARD_PCI6527 },
- { 0 }
+ { PCI_VDEVICE(NI, 0x2b10), .driver_data = BOARD_PXI6527 },
+ { PCI_VDEVICE(NI, 0x2b20), .driver_data = BOARD_PCI6527 },
+ { }
};
MODULE_DEVICE_TABLE(pci, ni6527_pci_table);
diff --git a/drivers/comedi/drivers/ni_65xx.c b/drivers/comedi/drivers/ni_65xx.c
index 58334de3b253..6ab91f6e75c5 100644
--- a/drivers/comedi/drivers/ni_65xx.c
+++ b/drivers/comedi/drivers/ni_65xx.c
@@ -783,29 +783,29 @@ static int ni_65xx_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id ni_65xx_pci_table[] = {
- { PCI_VDEVICE(NI, 0x1710), BOARD_PXI6509 },
- { PCI_VDEVICE(NI, 0x7085), BOARD_PCI6509 },
- { PCI_VDEVICE(NI, 0x7086), BOARD_PXI6528 },
- { PCI_VDEVICE(NI, 0x7087), BOARD_PCI6515 },
- { PCI_VDEVICE(NI, 0x7088), BOARD_PCI6514 },
- { PCI_VDEVICE(NI, 0x70a9), BOARD_PCI6528 },
- { PCI_VDEVICE(NI, 0x70c3), BOARD_PCI6511 },
- { PCI_VDEVICE(NI, 0x70c8), BOARD_PCI6513 },
- { PCI_VDEVICE(NI, 0x70c9), BOARD_PXI6515 },
- { PCI_VDEVICE(NI, 0x70cc), BOARD_PCI6512 },
- { PCI_VDEVICE(NI, 0x70cd), BOARD_PXI6514 },
- { PCI_VDEVICE(NI, 0x70d1), BOARD_PXI6513 },
- { PCI_VDEVICE(NI, 0x70d2), BOARD_PXI6512 },
- { PCI_VDEVICE(NI, 0x70d3), BOARD_PXI6511 },
- { PCI_VDEVICE(NI, 0x7124), BOARD_PCI6510 },
- { PCI_VDEVICE(NI, 0x7125), BOARD_PCI6516 },
- { PCI_VDEVICE(NI, 0x7126), BOARD_PCI6517 },
- { PCI_VDEVICE(NI, 0x7127), BOARD_PCI6518 },
- { PCI_VDEVICE(NI, 0x7128), BOARD_PCI6519 },
- { PCI_VDEVICE(NI, 0x718b), BOARD_PCI6521 },
- { PCI_VDEVICE(NI, 0x718c), BOARD_PXI6521 },
- { PCI_VDEVICE(NI, 0x71c5), BOARD_PCI6520 },
- { 0 }
+ { PCI_VDEVICE(NI, 0x1710), .driver_data = BOARD_PXI6509 },
+ { PCI_VDEVICE(NI, 0x7085), .driver_data = BOARD_PCI6509 },
+ { PCI_VDEVICE(NI, 0x7086), .driver_data = BOARD_PXI6528 },
+ { PCI_VDEVICE(NI, 0x7087), .driver_data = BOARD_PCI6515 },
+ { PCI_VDEVICE(NI, 0x7088), .driver_data = BOARD_PCI6514 },
+ { PCI_VDEVICE(NI, 0x70a9), .driver_data = BOARD_PCI6528 },
+ { PCI_VDEVICE(NI, 0x70c3), .driver_data = BOARD_PCI6511 },
+ { PCI_VDEVICE(NI, 0x70c8), .driver_data = BOARD_PCI6513 },
+ { PCI_VDEVICE(NI, 0x70c9), .driver_data = BOARD_PXI6515 },
+ { PCI_VDEVICE(NI, 0x70cc), .driver_data = BOARD_PCI6512 },
+ { PCI_VDEVICE(NI, 0x70cd), .driver_data = BOARD_PXI6514 },
+ { PCI_VDEVICE(NI, 0x70d1), .driver_data = BOARD_PXI6513 },
+ { PCI_VDEVICE(NI, 0x70d2), .driver_data = BOARD_PXI6512 },
+ { PCI_VDEVICE(NI, 0x70d3), .driver_data = BOARD_PXI6511 },
+ { PCI_VDEVICE(NI, 0x7124), .driver_data = BOARD_PCI6510 },
+ { PCI_VDEVICE(NI, 0x7125), .driver_data = BOARD_PCI6516 },
+ { PCI_VDEVICE(NI, 0x7126), .driver_data = BOARD_PCI6517 },
+ { PCI_VDEVICE(NI, 0x7127), .driver_data = BOARD_PCI6518 },
+ { PCI_VDEVICE(NI, 0x7128), .driver_data = BOARD_PCI6519 },
+ { PCI_VDEVICE(NI, 0x718b), .driver_data = BOARD_PCI6521 },
+ { PCI_VDEVICE(NI, 0x718c), .driver_data = BOARD_PXI6521 },
+ { PCI_VDEVICE(NI, 0x71c5), .driver_data = BOARD_PCI6520 },
+ { }
};
MODULE_DEVICE_TABLE(pci, ni_65xx_pci_table);
diff --git a/drivers/comedi/drivers/ni_660x.c b/drivers/comedi/drivers/ni_660x.c
index 0679bc39e0bc..5508cdb1b0ba 100644
--- a/drivers/comedi/drivers/ni_660x.c
+++ b/drivers/comedi/drivers/ni_660x.c
@@ -1230,14 +1230,14 @@ static int ni_660x_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id ni_660x_pci_table[] = {
- { PCI_VDEVICE(NI, 0x1310), BOARD_PCI6602 },
- { PCI_VDEVICE(NI, 0x1360), BOARD_PXI6602 },
- { PCI_VDEVICE(NI, 0x2c60), BOARD_PCI6601 },
- { PCI_VDEVICE(NI, 0x2db0), BOARD_PCI6608 },
- { PCI_VDEVICE(NI, 0x2cc0), BOARD_PXI6608 },
- { PCI_VDEVICE(NI, 0x1e30), BOARD_PCI6624 },
- { PCI_VDEVICE(NI, 0x1e40), BOARD_PXI6624 },
- { 0 }
+ { PCI_VDEVICE(NI, 0x1310), .driver_data = BOARD_PCI6602 },
+ { PCI_VDEVICE(NI, 0x1360), .driver_data = BOARD_PXI6602 },
+ { PCI_VDEVICE(NI, 0x2c60), .driver_data = BOARD_PCI6601 },
+ { PCI_VDEVICE(NI, 0x2db0), .driver_data = BOARD_PCI6608 },
+ { PCI_VDEVICE(NI, 0x2cc0), .driver_data = BOARD_PXI6608 },
+ { PCI_VDEVICE(NI, 0x1e30), .driver_data = BOARD_PCI6624 },
+ { PCI_VDEVICE(NI, 0x1e40), .driver_data = BOARD_PXI6624 },
+ { }
};
MODULE_DEVICE_TABLE(pci, ni_660x_pci_table);
diff --git a/drivers/comedi/drivers/ni_670x.c b/drivers/comedi/drivers/ni_670x.c
index 9455c2abcc24..670ffe2c744b 100644
--- a/drivers/comedi/drivers/ni_670x.c
+++ b/drivers/comedi/drivers/ni_670x.c
@@ -259,10 +259,10 @@ static int ni_670x_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id ni_670x_pci_table[] = {
- { PCI_VDEVICE(NI, 0x1290), BOARD_PCI6704 },
- { PCI_VDEVICE(NI, 0x1920), BOARD_PXI6704 },
- { PCI_VDEVICE(NI, 0x2c90), BOARD_PCI6703 },
- { 0 }
+ { PCI_VDEVICE(NI, 0x1290), .driver_data = BOARD_PCI6704 },
+ { PCI_VDEVICE(NI, 0x1920), .driver_data = BOARD_PXI6704 },
+ { PCI_VDEVICE(NI, 0x2c90), .driver_data = BOARD_PCI6703 },
+ { }
};
MODULE_DEVICE_TABLE(pci, ni_670x_pci_table);
diff --git a/drivers/comedi/drivers/ni_labpc_pci.c b/drivers/comedi/drivers/ni_labpc_pci.c
index e2a44bbd9fa6..4c8cf9776924 100644
--- a/drivers/comedi/drivers/ni_labpc_pci.c
+++ b/drivers/comedi/drivers/ni_labpc_pci.c
@@ -106,8 +106,8 @@ static struct comedi_driver labpc_pci_comedi_driver = {
};
static const struct pci_device_id labpc_pci_table[] = {
- { PCI_VDEVICE(NI, 0x161), BOARD_NI_PCI1200 },
- { 0 }
+ { PCI_VDEVICE(NI, 0x0161), .driver_data = BOARD_NI_PCI1200 },
+ { }
};
MODULE_DEVICE_TABLE(pci, labpc_pci_table);
diff --git a/drivers/comedi/drivers/ni_pcidio.c b/drivers/comedi/drivers/ni_pcidio.c
index 2c7bb9c1ea5b..b137bf14bcfd 100644
--- a/drivers/comedi/drivers/ni_pcidio.c
+++ b/drivers/comedi/drivers/ni_pcidio.c
@@ -987,10 +987,10 @@ static int ni_pcidio_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id ni_pcidio_pci_table[] = {
- { PCI_VDEVICE(NI, 0x1150), BOARD_PCIDIO_32HS },
- { PCI_VDEVICE(NI, 0x12b0), BOARD_PCI6534 },
- { PCI_VDEVICE(NI, 0x1320), BOARD_PXI6533 },
- { 0 }
+ { PCI_VDEVICE(NI, 0x1150), .driver_data = BOARD_PCIDIO_32HS },
+ { PCI_VDEVICE(NI, 0x12b0), .driver_data = BOARD_PCI6534 },
+ { PCI_VDEVICE(NI, 0x1320), .driver_data = BOARD_PXI6533 },
+ { }
};
MODULE_DEVICE_TABLE(pci, ni_pcidio_pci_table);
diff --git a/drivers/comedi/drivers/ni_pcimio.c b/drivers/comedi/drivers/ni_pcimio.c
index f63c390314e1..4be9ca4f4828 100644
--- a/drivers/comedi/drivers/ni_pcimio.c
+++ b/drivers/comedi/drivers/ni_pcimio.c
@@ -1402,72 +1402,72 @@ static int ni_pcimio_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id ni_pcimio_pci_table[] = {
- { PCI_VDEVICE(NI, 0x0162), BOARD_PCIMIO_16XE_50 }, /* 0x1620? */
- { PCI_VDEVICE(NI, 0x1170), BOARD_PCIMIO_16XE_10 },
- { PCI_VDEVICE(NI, 0x1180), BOARD_PCIMIO_16E_1 },
- { PCI_VDEVICE(NI, 0x1190), BOARD_PCIMIO_16E_4 },
- { PCI_VDEVICE(NI, 0x11b0), BOARD_PXI6070E },
- { PCI_VDEVICE(NI, 0x11c0), BOARD_PXI6040E },
- { PCI_VDEVICE(NI, 0x11d0), BOARD_PXI6030E },
- { PCI_VDEVICE(NI, 0x1270), BOARD_PCI6032E },
- { PCI_VDEVICE(NI, 0x1330), BOARD_PCI6031E },
- { PCI_VDEVICE(NI, 0x1340), BOARD_PCI6033E },
- { PCI_VDEVICE(NI, 0x1350), BOARD_PCI6071E },
- { PCI_VDEVICE(NI, 0x14e0), BOARD_PCI6110 },
- { PCI_VDEVICE(NI, 0x14f0), BOARD_PCI6111 },
- { PCI_VDEVICE(NI, 0x1580), BOARD_PXI6031E },
- { PCI_VDEVICE(NI, 0x15b0), BOARD_PXI6071E },
- { PCI_VDEVICE(NI, 0x1880), BOARD_PCI6711 },
- { PCI_VDEVICE(NI, 0x1870), BOARD_PCI6713 },
- { PCI_VDEVICE(NI, 0x18b0), BOARD_PCI6052E },
- { PCI_VDEVICE(NI, 0x18c0), BOARD_PXI6052E },
- { PCI_VDEVICE(NI, 0x2410), BOARD_PCI6733 },
- { PCI_VDEVICE(NI, 0x2420), BOARD_PXI6733 },
- { PCI_VDEVICE(NI, 0x2430), BOARD_PCI6731 },
- { PCI_VDEVICE(NI, 0x2890), BOARD_PCI6036E },
- { PCI_VDEVICE(NI, 0x28c0), BOARD_PCI6014 },
- { PCI_VDEVICE(NI, 0x2a60), BOARD_PCI6023E },
- { PCI_VDEVICE(NI, 0x2a70), BOARD_PCI6024E },
- { PCI_VDEVICE(NI, 0x2a80), BOARD_PCI6025E },
- { PCI_VDEVICE(NI, 0x2ab0), BOARD_PXI6025E },
- { PCI_VDEVICE(NI, 0x2b80), BOARD_PXI6713 },
- { PCI_VDEVICE(NI, 0x2b90), BOARD_PXI6711 },
- { PCI_VDEVICE(NI, 0x2c80), BOARD_PCI6035E },
- { PCI_VDEVICE(NI, 0x2ca0), BOARD_PCI6034E },
- { PCI_VDEVICE(NI, 0x70aa), BOARD_PCI6229 },
- { PCI_VDEVICE(NI, 0x70ab), BOARD_PCI6259 },
- { PCI_VDEVICE(NI, 0x70ac), BOARD_PCI6289 },
- { PCI_VDEVICE(NI, 0x70ad), BOARD_PXI6251 },
- { PCI_VDEVICE(NI, 0x70ae), BOARD_PXI6220 },
- { PCI_VDEVICE(NI, 0x70af), BOARD_PCI6221 },
- { PCI_VDEVICE(NI, 0x70b0), BOARD_PCI6220 },
- { PCI_VDEVICE(NI, 0x70b1), BOARD_PXI6229 },
- { PCI_VDEVICE(NI, 0x70b2), BOARD_PXI6259 },
- { PCI_VDEVICE(NI, 0x70b3), BOARD_PXI6289 },
- { PCI_VDEVICE(NI, 0x70b4), BOARD_PCI6250 },
- { PCI_VDEVICE(NI, 0x70b5), BOARD_PXI6221 },
- { PCI_VDEVICE(NI, 0x70b6), BOARD_PCI6280 },
- { PCI_VDEVICE(NI, 0x70b7), BOARD_PCI6254 },
- { PCI_VDEVICE(NI, 0x70b8), BOARD_PCI6251 },
- { PCI_VDEVICE(NI, 0x70b9), BOARD_PXI6250 },
- { PCI_VDEVICE(NI, 0x70ba), BOARD_PXI6254 },
- { PCI_VDEVICE(NI, 0x70bb), BOARD_PXI6280 },
- { PCI_VDEVICE(NI, 0x70bc), BOARD_PCI6284 },
- { PCI_VDEVICE(NI, 0x70bd), BOARD_PCI6281 },
- { PCI_VDEVICE(NI, 0x70be), BOARD_PXI6284 },
- { PCI_VDEVICE(NI, 0x70bf), BOARD_PXI6281 },
- { PCI_VDEVICE(NI, 0x70c0), BOARD_PCI6143 },
- { PCI_VDEVICE(NI, 0x70f2), BOARD_PCI6224 },
- { PCI_VDEVICE(NI, 0x70f3), BOARD_PXI6224 },
- { PCI_VDEVICE(NI, 0x710d), BOARD_PXI6143 },
- { PCI_VDEVICE(NI, 0x716c), BOARD_PCI6225 },
- { PCI_VDEVICE(NI, 0x716d), BOARD_PXI6225 },
- { PCI_VDEVICE(NI, 0x717d), BOARD_PCIE6251 },
- { PCI_VDEVICE(NI, 0x717f), BOARD_PCIE6259 },
- { PCI_VDEVICE(NI, 0x71bc), BOARD_PCI6221_37PIN },
- { PCI_VDEVICE(NI, 0x72e8), BOARD_PXIE6251 },
- { PCI_VDEVICE(NI, 0x72e9), BOARD_PXIE6259 },
- { 0 }
+ { PCI_VDEVICE(NI, 0x0162), .driver_data = BOARD_PCIMIO_16XE_50 }, /* 0x1620? */
+ { PCI_VDEVICE(NI, 0x1170), .driver_data = BOARD_PCIMIO_16XE_10 },
+ { PCI_VDEVICE(NI, 0x1180), .driver_data = BOARD_PCIMIO_16E_1 },
+ { PCI_VDEVICE(NI, 0x1190), .driver_data = BOARD_PCIMIO_16E_4 },
+ { PCI_VDEVICE(NI, 0x11b0), .driver_data = BOARD_PXI6070E },
+ { PCI_VDEVICE(NI, 0x11c0), .driver_data = BOARD_PXI6040E },
+ { PCI_VDEVICE(NI, 0x11d0), .driver_data = BOARD_PXI6030E },
+ { PCI_VDEVICE(NI, 0x1270), .driver_data = BOARD_PCI6032E },
+ { PCI_VDEVICE(NI, 0x1330), .driver_data = BOARD_PCI6031E },
+ { PCI_VDEVICE(NI, 0x1340), .driver_data = BOARD_PCI6033E },
+ { PCI_VDEVICE(NI, 0x1350), .driver_data = BOARD_PCI6071E },
+ { PCI_VDEVICE(NI, 0x14e0), .driver_data = BOARD_PCI6110 },
+ { PCI_VDEVICE(NI, 0x14f0), .driver_data = BOARD_PCI6111 },
+ { PCI_VDEVICE(NI, 0x1580), .driver_data = BOARD_PXI6031E },
+ { PCI_VDEVICE(NI, 0x15b0), .driver_data = BOARD_PXI6071E },
+ { PCI_VDEVICE(NI, 0x1880), .driver_data = BOARD_PCI6711 },
+ { PCI_VDEVICE(NI, 0x1870), .driver_data = BOARD_PCI6713 },
+ { PCI_VDEVICE(NI, 0x18b0), .driver_data = BOARD_PCI6052E },
+ { PCI_VDEVICE(NI, 0x18c0), .driver_data = BOARD_PXI6052E },
+ { PCI_VDEVICE(NI, 0x2410), .driver_data = BOARD_PCI6733 },
+ { PCI_VDEVICE(NI, 0x2420), .driver_data = BOARD_PXI6733 },
+ { PCI_VDEVICE(NI, 0x2430), .driver_data = BOARD_PCI6731 },
+ { PCI_VDEVICE(NI, 0x2890), .driver_data = BOARD_PCI6036E },
+ { PCI_VDEVICE(NI, 0x28c0), .driver_data = BOARD_PCI6014 },
+ { PCI_VDEVICE(NI, 0x2a60), .driver_data = BOARD_PCI6023E },
+ { PCI_VDEVICE(NI, 0x2a70), .driver_data = BOARD_PCI6024E },
+ { PCI_VDEVICE(NI, 0x2a80), .driver_data = BOARD_PCI6025E },
+ { PCI_VDEVICE(NI, 0x2ab0), .driver_data = BOARD_PXI6025E },
+ { PCI_VDEVICE(NI, 0x2b80), .driver_data = BOARD_PXI6713 },
+ { PCI_VDEVICE(NI, 0x2b90), .driver_data = BOARD_PXI6711 },
+ { PCI_VDEVICE(NI, 0x2c80), .driver_data = BOARD_PCI6035E },
+ { PCI_VDEVICE(NI, 0x2ca0), .driver_data = BOARD_PCI6034E },
+ { PCI_VDEVICE(NI, 0x70aa), .driver_data = BOARD_PCI6229 },
+ { PCI_VDEVICE(NI, 0x70ab), .driver_data = BOARD_PCI6259 },
+ { PCI_VDEVICE(NI, 0x70ac), .driver_data = BOARD_PCI6289 },
+ { PCI_VDEVICE(NI, 0x70ad), .driver_data = BOARD_PXI6251 },
+ { PCI_VDEVICE(NI, 0x70ae), .driver_data = BOARD_PXI6220 },
+ { PCI_VDEVICE(NI, 0x70af), .driver_data = BOARD_PCI6221 },
+ { PCI_VDEVICE(NI, 0x70b0), .driver_data = BOARD_PCI6220 },
+ { PCI_VDEVICE(NI, 0x70b1), .driver_data = BOARD_PXI6229 },
+ { PCI_VDEVICE(NI, 0x70b2), .driver_data = BOARD_PXI6259 },
+ { PCI_VDEVICE(NI, 0x70b3), .driver_data = BOARD_PXI6289 },
+ { PCI_VDEVICE(NI, 0x70b4), .driver_data = BOARD_PCI6250 },
+ { PCI_VDEVICE(NI, 0x70b5), .driver_data = BOARD_PXI6221 },
+ { PCI_VDEVICE(NI, 0x70b6), .driver_data = BOARD_PCI6280 },
+ { PCI_VDEVICE(NI, 0x70b7), .driver_data = BOARD_PCI6254 },
+ { PCI_VDEVICE(NI, 0x70b8), .driver_data = BOARD_PCI6251 },
+ { PCI_VDEVICE(NI, 0x70b9), .driver_data = BOARD_PXI6250 },
+ { PCI_VDEVICE(NI, 0x70ba), .driver_data = BOARD_PXI6254 },
+ { PCI_VDEVICE(NI, 0x70bb), .driver_data = BOARD_PXI6280 },
+ { PCI_VDEVICE(NI, 0x70bc), .driver_data = BOARD_PCI6284 },
+ { PCI_VDEVICE(NI, 0x70bd), .driver_data = BOARD_PCI6281 },
+ { PCI_VDEVICE(NI, 0x70be), .driver_data = BOARD_PXI6284 },
+ { PCI_VDEVICE(NI, 0x70bf), .driver_data = BOARD_PXI6281 },
+ { PCI_VDEVICE(NI, 0x70c0), .driver_data = BOARD_PCI6143 },
+ { PCI_VDEVICE(NI, 0x70f2), .driver_data = BOARD_PCI6224 },
+ { PCI_VDEVICE(NI, 0x70f3), .driver_data = BOARD_PXI6224 },
+ { PCI_VDEVICE(NI, 0x710d), .driver_data = BOARD_PXI6143 },
+ { PCI_VDEVICE(NI, 0x716c), .driver_data = BOARD_PCI6225 },
+ { PCI_VDEVICE(NI, 0x716d), .driver_data = BOARD_PXI6225 },
+ { PCI_VDEVICE(NI, 0x717d), .driver_data = BOARD_PCIE6251 },
+ { PCI_VDEVICE(NI, 0x717f), .driver_data = BOARD_PCIE6259 },
+ { PCI_VDEVICE(NI, 0x71bc), .driver_data = BOARD_PCI6221_37PIN },
+ { PCI_VDEVICE(NI, 0x72e8), .driver_data = BOARD_PXIE6251 },
+ { PCI_VDEVICE(NI, 0x72e9), .driver_data = BOARD_PXIE6259 },
+ { }
};
MODULE_DEVICE_TABLE(pci, ni_pcimio_pci_table);
diff --git a/drivers/comedi/drivers/rtd520.c b/drivers/comedi/drivers/rtd520.c
index 44bb0decd7a4..0575913abfe7 100644
--- a/drivers/comedi/drivers/rtd520.c
+++ b/drivers/comedi/drivers/rtd520.c
@@ -1345,9 +1345,9 @@ static int rtd520_pci_probe(struct pci_dev *dev,
}
static const struct pci_device_id rtd520_pci_table[] = {
- { PCI_VDEVICE(RTD, 0x7520), BOARD_DM7520 },
- { PCI_VDEVICE(RTD, 0x4520), BOARD_PCI4520 },
- { 0 }
+ { PCI_VDEVICE(RTD, 0x7520), .driver_data = BOARD_DM7520 },
+ { PCI_VDEVICE(RTD, 0x4520), .driver_data = BOARD_PCI4520 },
+ { }
};
MODULE_DEVICE_TABLE(pci, rtd520_pci_table);
diff --git a/drivers/comedi/drivers/s626.c b/drivers/comedi/drivers/s626.c
index 0e5f9a9a7fd3..ce7ae6b6d40b 100644
--- a/drivers/comedi/drivers/s626.c
+++ b/drivers/comedi/drivers/s626.c
@@ -2585,9 +2585,9 @@ static int s626_pci_probe(struct pci_dev *dev,
* Philips SAA7146 media/dvb based cards.
*/
static const struct pci_device_id s626_pci_table[] = {
- { PCI_DEVICE_SUB(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146,
- 0x6000, 0x0272) },
- { 0 }
+ { PCI_VDEVICE_SUB(PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146,
+ 0x6000, 0x0272) },
+ { }
};
MODULE_DEVICE_TABLE(pci, s626_pci_table);
base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731
--
2.47.3