Quellcode durchsuchen

mei: don't use deprecated DEFINE_PCI_DEVICE_TABLE macro

Using struct pci_device_id is preferred  over
deprecated DEFINE_PCI_DEVICE_TABLE macro

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Winkler vor 11 Jahren
Ursprung
Commit
a05f8f86e4
2 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
  1. 1 1
      drivers/misc/mei/pci-me.c
  2. 1 1
      drivers/misc/mei/pci-txe.c

+ 1 - 1
drivers/misc/mei/pci-me.c

@@ -41,7 +41,7 @@
 #include "hw-me.h"
 #include "hw-me.h"
 
 
 /* mei_pci_tbl - PCI Device ID Table */
 /* mei_pci_tbl - PCI Device ID Table */
-static DEFINE_PCI_DEVICE_TABLE(mei_me_pci_tbl) = {
+static const struct pci_device_id mei_me_pci_tbl[] = {
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82946GZ)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82946GZ)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82G35)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82G35)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82Q965)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82Q965)},

+ 1 - 1
drivers/misc/mei/pci-txe.c

@@ -34,7 +34,7 @@
 #include "mei_dev.h"
 #include "mei_dev.h"
 #include "hw-txe.h"
 #include "hw-txe.h"
 
 
-static DEFINE_PCI_DEVICE_TABLE(mei_txe_pci_tbl) = {
+static const struct pci_device_id mei_txe_pci_tbl[] = {
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0F18)}, /* Baytrail */
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0F18)}, /* Baytrail */
 	{0, }
 	{0, }
 };
 };