Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32182cd3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7426d29e

drivers/misc/genwqe/card_base.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ static struct dentry *debugfs_genwqe; 
static struct genwqe_dev *genwqe_devices[GENWQE_CARD_NO_MAX];

static struct genwqe_dev *genwqe_devices[GENWQE_CARD_NO_MAX];





/* PCI structure for identifying device by PCI vendor and device ID */

/* PCI structure for identifying device by PCI vendor and device ID */

static DEFINE_PCI_DEVICE_TABLE(genwqe_device_table) = {

static const struct pci_device_id genwqe_device_table[] = {

	{ .vendor      = PCI_VENDOR_ID_IBM,

	{ .vendor      = PCI_VENDOR_ID_IBM,

	  .device      = PCI_DEVICE_GENWQE,

	  .device      = PCI_DEVICE_GENWQE,

	  .subvendor   = PCI_SUBVENDOR_ID_IBM,

	  .subvendor   = PCI_SUBVENDOR_ID_IBM,

drivers/misc/mic/host/mic_main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ 




static const char mic_driver_name[] = "mic";

static const char mic_driver_name[] = "mic";





static DEFINE_PCI_DEVICE_TABLE(mic_pci_tbl) = {

static const struct pci_device_id mic_pci_tbl[] = {

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MIC_X100_PCI_DEVICE_2250)},

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MIC_X100_PCI_DEVICE_2250)},

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MIC_X100_PCI_DEVICE_2251)},

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MIC_X100_PCI_DEVICE_2251)},

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MIC_X100_PCI_DEVICE_2252)},

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MIC_X100_PCI_DEVICE_2252)},

drivers/misc/vmw_vmci/vmci_guest.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -748,7 +748,7 @@ static void vmci_guest_remove_device(struct pci_dev *pdev) 
	/* The rest are managed resources and will be freed by PCI core */

	/* The rest are managed resources and will be freed by PCI core */

}

}





static DEFINE_PCI_DEVICE_TABLE(vmci_ids) = {

static const struct pci_device_id vmci_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_VMWARE, PCI_DEVICE_ID_VMWARE_VMCI), },

	{ PCI_DEVICE(PCI_VENDOR_ID_VMWARE, PCI_DEVICE_ID_VMWARE_VMCI), },

	{ 0 },

	{ 0 },

};

};