Commit 1013762c authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman

staging/comedi/jr3: Convert pci_table entries to PCI_DEVICE (if PCI_ANY_ID is used)

This patch converts pci_table entries to use the PCI_DEVICE macro,
if .subvendor and .subdevice are set to PCI_ANY_ID,
and thus improves readablity.

Since the driver_data field isn't used anywhere we can also drop the
assignments for class, class_mask and driver_data.
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d9fcd77b
...@@ -71,18 +71,12 @@ static struct comedi_driver driver_jr3_pci = { ...@@ -71,18 +71,12 @@ static struct comedi_driver driver_jr3_pci = {
}; };
static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = { static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {
{ { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL) },
PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL, { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW) },
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL) },
PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW, { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL) },
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_4_CHANNEL) },
PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL, {0}
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_4_CHANNEL,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
0}
}; };
MODULE_DEVICE_TABLE(pci, jr3_pci_pci_table); MODULE_DEVICE_TABLE(pci, jr3_pci_pci_table);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment