Commit 0178a7a54d408d2c5b7bbe7eee9450bffbec0989

Authored by Greg Kroah-Hartman
1 parent 32182cd39d

pcmcia: remove DEFINE_PCI_DEVICE_TABLE usage

It's not needed, just use the "real" structure definition instead.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 5 changed files with 5 additions and 5 deletions Side-by-side Diff

drivers/pcmcia/bcm63xx_pcmcia.c
... ... @@ -475,7 +475,7 @@
475 475 bcm63xx_cb_dev = NULL;
476 476 }
477 477  
478   -static DEFINE_PCI_DEVICE_TABLE(bcm63xx_cb_table) = {
  478 +static const struct pci_device_id bcm63xx_cb_table[] = {
479 479 {
480 480 .vendor = PCI_VENDOR_ID_BROADCOM,
481 481 .device = BCM6348_CPU_ID,
drivers/pcmcia/i82092.c
... ... @@ -25,7 +25,7 @@
25 25 MODULE_LICENSE("GPL");
26 26  
27 27 /* PCI core routines */
28   -static DEFINE_PCI_DEVICE_TABLE(i82092aa_pci_ids) = {
  28 +static const struct pci_device_id i82092aa_pci_ids[] = {
29 29 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82092AA_0) },
30 30 { }
31 31 };
drivers/pcmcia/pd6729.c
... ... @@ -764,7 +764,7 @@
764 764 kfree(socket);
765 765 }
766 766  
767   -static DEFINE_PCI_DEVICE_TABLE(pd6729_pci_ids) = {
  767 +static const struct pci_device_id pd6729_pci_ids[] = {
768 768 { PCI_DEVICE(PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_6729) },
769 769 { }
770 770 };
drivers/pcmcia/vrc4173_cardu.c
... ... @@ -563,7 +563,7 @@
563 563  
564 564 __setup("vrc4173_cardu=", vrc4173_cardu_setup);
565 565  
566   -static DEFINE_PCI_DEVICE_TABLE(vrc4173_cardu_id_table) = {
  566 +static const struct pci_device_id vrc4173_cardu_id_table[] = {
567 567 { PCI_DEVICE(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NAPCCARD) },
568 568 {0, }
569 569 };
drivers/pcmcia/yenta_socket.c
... ... @@ -1352,7 +1352,7 @@
1352 1352 .driver_data = CARDBUS_TYPE_##type, \
1353 1353 }
1354 1354  
1355   -static DEFINE_PCI_DEVICE_TABLE(yenta_table) = {
  1355 +static const struct pci_device_id yenta_table[] = {
1356 1356 CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1031, TI),
1357 1357  
1358 1358 /*