tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
misc: remove DEFINE_PCI_DEVICE_TABLE usage
Removes DEFINE_PCI_DEVICE_TABLE from drivers/misc/genwqe/card_base.c,
drivers/misc/genwqe/card_base.c, and drivers/misc/vmw_vmci/vmci_guest.c
in preferance of a "real" structure definition.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+3
-3
+1
-1
drivers/misc/genwqe/card_base.c
+1
-1
drivers/misc/genwqe/card_base.c
···
57
57
static struct genwqe_dev *genwqe_devices[GENWQE_CARD_NO_MAX];
58
58
59
59
/* PCI structure for identifying device by PCI vendor and device ID */
60
-
static DEFINE_PCI_DEVICE_TABLE(genwqe_device_table) = {
60
+
static const struct pci_device_id genwqe_device_table[] = {
61
61
{ .vendor = PCI_VENDOR_ID_IBM,
62
62
.device = PCI_DEVICE_GENWQE,
63
63
.subvendor = PCI_SUBVENDOR_ID_IBM,
+1
-1
drivers/misc/mic/host/mic_main.c
+1
-1
drivers/misc/mic/host/mic_main.c
···
38
38
39
39
static const char mic_driver_name[] = "mic";
40
40
41
-
static DEFINE_PCI_DEVICE_TABLE(mic_pci_tbl) = {
41
+
static const struct pci_device_id mic_pci_tbl[] = {
42
42
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MIC_X100_PCI_DEVICE_2250)},
43
43
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MIC_X100_PCI_DEVICE_2251)},
44
44
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MIC_X100_PCI_DEVICE_2252)},
+1
-1
drivers/misc/vmw_vmci/vmci_guest.c
+1
-1
drivers/misc/vmw_vmci/vmci_guest.c
···
748
748
/* The rest are managed resources and will be freed by PCI core */
749
749
}
750
750
751
-
static DEFINE_PCI_DEVICE_TABLE(vmci_ids) = {
751
+
static const struct pci_device_id vmci_ids[] = {
752
752
{ PCI_DEVICE(PCI_VENDOR_ID_VMWARE, PCI_DEVICE_ID_VMWARE_VMCI), },
753
753
{ 0 },
754
754
};