diff options
author | Benoit Taine <benoit.taine@lip6.fr> | 2014-08-08 09:56:03 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-08-12 14:15:14 -0400 |
commit | 9baa3c34ac4e27f7e062f266f50cc5dbea26a6c1 (patch) | |
tree | 2c6f874e1eb4dbb415ad96b6a39f1f7982655412 | |
parent | c8d6637d0497d62093dbba0694c7b3a80b79bfe1 (diff) |
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
We should prefer `struct pci_device_id` over `DEFINE_PCI_DEVICE_TABLE` to
meet kernel coding style guidelines. This issue was reported by checkpatch.
A simplified version of the semantic patch that makes this change is as
follows (http://coccinelle.lip6.fr/):
// <smpl>
@@
identifier i;
declarer name DEFINE_PCI_DEVICE_TABLE;
initializer z;
@@
- DEFINE_PCI_DEVICE_TABLE(i)
+ const struct pci_device_id i[]
= z;
// </smpl>
[bhelgaas: add semantic patch]
Signed-off-by: Benoit Taine <benoit.taine@lip6.fr>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
230 files changed, 242 insertions, 240 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c index cfc6f9dfcd90..0939f86f543d 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c | |||
@@ -945,7 +945,7 @@ static struct intel_uncore_type *snbep_pci_uncores[] = { | |||
945 | NULL, | 945 | NULL, |
946 | }; | 946 | }; |
947 | 947 | ||
948 | static DEFINE_PCI_DEVICE_TABLE(snbep_uncore_pci_ids) = { | 948 | static const struct pci_device_id snbep_uncore_pci_ids[] = { |
949 | { /* Home Agent */ | 949 | { /* Home Agent */ |
950 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA), | 950 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA), |
951 | .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_HA, 0), | 951 | .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_HA, 0), |
@@ -1510,7 +1510,7 @@ static struct intel_uncore_type *ivt_pci_uncores[] = { | |||
1510 | NULL, | 1510 | NULL, |
1511 | }; | 1511 | }; |
1512 | 1512 | ||
1513 | static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = { | 1513 | static const struct pci_device_id ivt_uncore_pci_ids[] = { |
1514 | { /* Home Agent 0 */ | 1514 | { /* Home Agent 0 */ |
1515 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30), | 1515 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30), |
1516 | .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_HA, 0), | 1516 | .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_HA, 0), |
@@ -1985,7 +1985,7 @@ static struct intel_uncore_type *snb_pci_uncores[] = { | |||
1985 | NULL, | 1985 | NULL, |
1986 | }; | 1986 | }; |
1987 | 1987 | ||
1988 | static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = { | 1988 | static const struct pci_device_id snb_uncore_pci_ids[] = { |
1989 | { /* IMC */ | 1989 | { /* IMC */ |
1990 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SNB_IMC), | 1990 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SNB_IMC), |
1991 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), | 1991 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), |
@@ -1993,7 +1993,7 @@ static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = { | |||
1993 | { /* end: all zeroes */ }, | 1993 | { /* end: all zeroes */ }, |
1994 | }; | 1994 | }; |
1995 | 1995 | ||
1996 | static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = { | 1996 | static const struct pci_device_id ivb_uncore_pci_ids[] = { |
1997 | { /* IMC */ | 1997 | { /* IMC */ |
1998 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC), | 1998 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC), |
1999 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), | 1999 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), |
@@ -2001,7 +2001,7 @@ static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = { | |||
2001 | { /* end: all zeroes */ }, | 2001 | { /* end: all zeroes */ }, |
2002 | }; | 2002 | }; |
2003 | 2003 | ||
2004 | static DEFINE_PCI_DEVICE_TABLE(hsw_uncore_pci_ids) = { | 2004 | static const struct pci_device_id hsw_uncore_pci_ids[] = { |
2005 | { /* IMC */ | 2005 | { /* IMC */ |
2006 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC), | 2006 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC), |
2007 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), | 2007 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), |
diff --git a/arch/x86/kernel/iosf_mbi.c b/arch/x86/kernel/iosf_mbi.c index d30acdc1229d..9030e83db6ee 100644 --- a/arch/x86/kernel/iosf_mbi.c +++ b/arch/x86/kernel/iosf_mbi.c | |||
@@ -202,7 +202,7 @@ static int iosf_mbi_probe(struct pci_dev *pdev, | |||
202 | return 0; | 202 | return 0; |
203 | } | 203 | } |
204 | 204 | ||
205 | static DEFINE_PCI_DEVICE_TABLE(iosf_mbi_pci_ids) = { | 205 | static const struct pci_device_id iosf_mbi_pci_ids[] = { |
206 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_BAYTRAIL) }, | 206 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_BAYTRAIL) }, |
207 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_QUARK_X1000) }, | 207 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_QUARK_X1000) }, |
208 | { 0, }, | 208 | { 0, }, |
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 295f3afbbef5..db1e9560d8a7 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c | |||
@@ -4632,7 +4632,7 @@ static void mtip_pci_shutdown(struct pci_dev *pdev) | |||
4632 | } | 4632 | } |
4633 | 4633 | ||
4634 | /* Table of device ids supported by this driver. */ | 4634 | /* Table of device ids supported by this driver. */ |
4635 | static DEFINE_PCI_DEVICE_TABLE(mtip_pci_tbl) = { | 4635 | static const struct pci_device_id mtip_pci_tbl[] = { |
4636 | { PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320H_DEVICE_ID) }, | 4636 | { PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320H_DEVICE_ID) }, |
4637 | { PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320M_DEVICE_ID) }, | 4637 | { PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320M_DEVICE_ID) }, |
4638 | { PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320S_DEVICE_ID) }, | 4638 | { PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320S_DEVICE_ID) }, |
diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c index a8de2eec6ff3..820b4009d5f7 100644 --- a/drivers/block/rsxx/core.c +++ b/drivers/block/rsxx/core.c | |||
@@ -1137,7 +1137,7 @@ static const struct pci_error_handlers rsxx_err_handler = { | |||
1137 | .slot_reset = rsxx_slot_reset, | 1137 | .slot_reset = rsxx_slot_reset, |
1138 | }; | 1138 | }; |
1139 | 1139 | ||
1140 | static DEFINE_PCI_DEVICE_TABLE(rsxx_pci_ids) = { | 1140 | static const struct pci_device_id rsxx_pci_ids[] = { |
1141 | {PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS70_FLASH)}, | 1141 | {PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS70_FLASH)}, |
1142 | {PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS80_FLASH)}, | 1142 | {PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS80_FLASH)}, |
1143 | {0,}, | 1143 | {0,}, |
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index f0a089df85cc..8fcdcfb4b472 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c | |||
@@ -4766,7 +4766,7 @@ static const struct block_device_operations skd_blockdev_ops = { | |||
4766 | ***************************************************************************** | 4766 | ***************************************************************************** |
4767 | */ | 4767 | */ |
4768 | 4768 | ||
4769 | static DEFINE_PCI_DEVICE_TABLE(skd_pci_tbl) = { | 4769 | static const struct pci_device_id skd_pci_tbl[] = { |
4770 | { PCI_VENDOR_ID_STEC, PCI_DEVICE_ID_S1120, | 4770 | { PCI_VENDOR_ID_STEC, PCI_DEVICE_ID_S1120, |
4771 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, | 4771 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, |
4772 | { 0 } /* terminate list */ | 4772 | { 0 } /* terminate list */ |
diff --git a/drivers/crypto/ccp/ccp-pci.c b/drivers/crypto/ccp/ccp-pci.c index 180cc87b4dbb..7f89c946adfe 100644 --- a/drivers/crypto/ccp/ccp-pci.c +++ b/drivers/crypto/ccp/ccp-pci.c | |||
@@ -320,7 +320,7 @@ static int ccp_pci_resume(struct pci_dev *pdev) | |||
320 | } | 320 | } |
321 | #endif | 321 | #endif |
322 | 322 | ||
323 | static DEFINE_PCI_DEVICE_TABLE(ccp_pci_table) = { | 323 | static const struct pci_device_id ccp_pci_table[] = { |
324 | { PCI_VDEVICE(AMD, 0x1537), }, | 324 | { PCI_VDEVICE(AMD, 0x1537), }, |
325 | /* Last entry must be zero */ | 325 | /* Last entry must be zero */ |
326 | { 0, } | 326 | { 0, } |
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index 44074fbcf7ff..f19682a93c24 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c | |||
@@ -51,7 +51,7 @@ static struct drm_driver driver; | |||
51 | .subdevice = PCI_ANY_ID, \ | 51 | .subdevice = PCI_ANY_ID, \ |
52 | .driver_data = (unsigned long) info } | 52 | .driver_data = (unsigned long) info } |
53 | 53 | ||
54 | static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { | 54 | static const struct pci_device_id pciidlist[] = { |
55 | AST_VGA_DEVICE(PCI_CHIP_AST2000, NULL), | 55 | AST_VGA_DEVICE(PCI_CHIP_AST2000, NULL), |
56 | AST_VGA_DEVICE(PCI_CHIP_AST2100, NULL), | 56 | AST_VGA_DEVICE(PCI_CHIP_AST2100, NULL), |
57 | /* AST_VGA_DEVICE(PCI_CHIP_AST1180, NULL), - don't bind to 1180 for now */ | 57 | /* AST_VGA_DEVICE(PCI_CHIP_AST1180, NULL), - don't bind to 1180 for now */ |
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index f5e0ead974a6..9738e9b14708 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c | |||
@@ -177,7 +177,7 @@ static void bochs_pci_remove(struct pci_dev *pdev) | |||
177 | drm_put_dev(dev); | 177 | drm_put_dev(dev); |
178 | } | 178 | } |
179 | 179 | ||
180 | static DEFINE_PCI_DEVICE_TABLE(bochs_pci_tbl) = { | 180 | static const struct pci_device_id bochs_pci_tbl[] = { |
181 | { | 181 | { |
182 | .vendor = 0x1234, | 182 | .vendor = 0x1234, |
183 | .device = 0x1111, | 183 | .device = 0x1111, |
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c index 4516b052cc67..919c73b94447 100644 --- a/drivers/gpu/drm/cirrus/cirrus_drv.c +++ b/drivers/gpu/drm/cirrus/cirrus_drv.c | |||
@@ -29,7 +29,7 @@ module_param_named(modeset, cirrus_modeset, int, 0400); | |||
29 | static struct drm_driver driver; | 29 | static struct drm_driver driver; |
30 | 30 | ||
31 | /* only bind to the cirrus chip in qemu */ | 31 | /* only bind to the cirrus chip in qemu */ |
32 | static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { | 32 | static const struct pci_device_id pciidlist[] = { |
33 | { PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_5446, 0x1af4, 0x1100, 0, | 33 | { PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_5446, 0x1af4, 0x1100, 0, |
34 | 0, 0 }, | 34 | 0, 0 }, |
35 | {0,} | 35 | {0,} |
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c index e6f5c620a0a2..54f73f50571a 100644 --- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c +++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c | |||
@@ -674,7 +674,7 @@ failed_connector: | |||
674 | kfree(gma_encoder); | 674 | kfree(gma_encoder); |
675 | } | 675 | } |
676 | 676 | ||
677 | static DEFINE_PCI_DEVICE_TABLE(hdmi_ids) = { | 677 | static const struct pci_device_id hdmi_ids[] = { |
678 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080d) }, | 678 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080d) }, |
679 | { 0 } | 679 | { 0 } |
680 | }; | 680 | }; |
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 6e8fe9ec02b5..eec993f93b1a 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c | |||
@@ -54,7 +54,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); | |||
54 | * PowerVR SGX545 - Cedartrail - Intel GMA 3650, Intel Atom D2550, D2700, | 54 | * PowerVR SGX545 - Cedartrail - Intel GMA 3650, Intel Atom D2550, D2700, |
55 | * N2800 | 55 | * N2800 |
56 | */ | 56 | */ |
57 | static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { | 57 | static const struct pci_device_id pciidlist[] = { |
58 | { 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops }, | 58 | { 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops }, |
59 | { 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops }, | 59 | { 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops }, |
60 | #if defined(CONFIG_DRM_GMA600) | 60 | #if defined(CONFIG_DRM_GMA600) |
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index f15ea3c4a90a..2d75d6df0789 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c | |||
@@ -28,7 +28,7 @@ module_param_named(modeset, mgag200_modeset, int, 0400); | |||
28 | 28 | ||
29 | static struct drm_driver driver; | 29 | static struct drm_driver driver; |
30 | 30 | ||
31 | static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { | 31 | static const struct pci_device_id pciidlist[] = { |
32 | { PCI_VENDOR_ID_MATROX, 0x522, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_SE_A }, | 32 | { PCI_VENDOR_ID_MATROX, 0x522, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_SE_A }, |
33 | { PCI_VENDOR_ID_MATROX, 0x524, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_SE_B }, | 33 | { PCI_VENDOR_ID_MATROX, 0x524, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_SE_B }, |
34 | { PCI_VENDOR_ID_MATROX, 0x530, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_EV }, | 34 | { PCI_VENDOR_ID_MATROX, 0x530, PCI_ANY_ID, PCI_ANY_ID, 0, 0, G200_EV }, |
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 6e936634d65c..a3fd92029a14 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include "qxl_object.h" | 38 | #include "qxl_object.h" |
39 | 39 | ||
40 | extern int qxl_max_ioctls; | 40 | extern int qxl_max_ioctls; |
41 | static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { | 41 | static const struct pci_device_id pciidlist[] = { |
42 | { 0x1b36, 0x100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, | 42 | { 0x1b36, 0x100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, |
43 | 0xffff00, 0 }, | 43 | 0xffff00, 0 }, |
44 | { 0x1b36, 0x100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_OTHER << 8, | 44 | { 0x1b36, 0x100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_OTHER << 8, |
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c index 8d3c78ddc906..729da39c49ed 100644 --- a/drivers/infiniband/hw/qib/qib_init.c +++ b/drivers/infiniband/hw/qib/qib_init.c | |||
@@ -1222,7 +1222,7 @@ static int qib_init_one(struct pci_dev *, const struct pci_device_id *); | |||
1222 | #define DRIVER_LOAD_MSG "Intel " QIB_DRV_NAME " loaded: " | 1222 | #define DRIVER_LOAD_MSG "Intel " QIB_DRV_NAME " loaded: " |
1223 | #define PFX QIB_DRV_NAME ": " | 1223 | #define PFX QIB_DRV_NAME ": " |
1224 | 1224 | ||
1225 | static DEFINE_PCI_DEVICE_TABLE(qib_pci_tbl) = { | 1225 | static const struct pci_device_id qib_pci_tbl[] = { |
1226 | { PCI_DEVICE(PCI_VENDOR_ID_PATHSCALE, PCI_DEVICE_ID_QLOGIC_IB_6120) }, | 1226 | { PCI_DEVICE(PCI_VENDOR_ID_PATHSCALE, PCI_DEVICE_ID_QLOGIC_IB_6120) }, |
1227 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7220) }, | 1227 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7220) }, |
1228 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7322) }, | 1228 | { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7322) }, |
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c index fb6d026f92cd..0d0f98695d53 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c | |||
@@ -490,7 +490,7 @@ out: | |||
490 | 490 | ||
491 | /* Start of PCI section */ | 491 | /* Start of PCI section */ |
492 | 492 | ||
493 | static DEFINE_PCI_DEVICE_TABLE(usnic_ib_pci_ids) = { | 493 | static const struct pci_device_id usnic_ib_pci_ids[] = { |
494 | {PCI_DEVICE(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_USPACE_NIC)}, | 494 | {PCI_DEVICE(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_USPACE_NIC)}, |
495 | {0,} | 495 | {0,} |
496 | }; | 496 | }; |
diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c index f70546a3a7cc..6ada1b36685b 100644 --- a/drivers/mmc/host/dw_mmc-pci.c +++ b/drivers/mmc/host/dw_mmc-pci.c | |||
@@ -102,7 +102,7 @@ static int dw_mci_pci_resume(struct device *dev) | |||
102 | 102 | ||
103 | static SIMPLE_DEV_PM_OPS(dw_mci_pci_pmops, dw_mci_pci_suspend, dw_mci_pci_resume); | 103 | static SIMPLE_DEV_PM_OPS(dw_mci_pci_pmops, dw_mci_pci_suspend, dw_mci_pci_resume); |
104 | 104 | ||
105 | static DEFINE_PCI_DEVICE_TABLE(dw_mci_pci_id) = { | 105 | static const struct pci_device_id dw_mci_pci_id[] = { |
106 | { PCI_DEVICE(SYNOPSYS_DW_MCI_VENDOR_ID, SYNOPSYS_DW_MCI_DEVICE_ID) }, | 106 | { PCI_DEVICE(SYNOPSYS_DW_MCI_VENDOR_ID, SYNOPSYS_DW_MCI_DEVICE_ID) }, |
107 | {} | 107 | {} |
108 | }; | 108 | }; |
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c index cbc44f53755a..7bb292e59559 100644 --- a/drivers/net/arcnet/com20020-pci.c +++ b/drivers/net/arcnet/com20020-pci.c | |||
@@ -144,7 +144,7 @@ static void com20020pci_remove(struct pci_dev *pdev) | |||
144 | free_netdev(dev); | 144 | free_netdev(dev); |
145 | } | 145 | } |
146 | 146 | ||
147 | static DEFINE_PCI_DEVICE_TABLE(com20020pci_id_table) = { | 147 | static const struct pci_device_id com20020pci_id_table[] = { |
148 | { 0x1571, 0xa001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 148 | { 0x1571, 0xa001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
149 | { 0x1571, 0xa002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 149 | { 0x1571, 0xa002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
150 | { 0x1571, 0xa003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 150 | { 0x1571, 0xa003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c index 5d11e0e4225b..7be393c96b1a 100644 --- a/drivers/net/can/c_can/c_can_pci.c +++ b/drivers/net/can/c_can/c_can_pci.c | |||
@@ -270,7 +270,8 @@ static struct c_can_pci_data c_can_pch = { | |||
270 | PCI_DEVICE(_vend, _dev), \ | 270 | PCI_DEVICE(_vend, _dev), \ |
271 | .driver_data = (unsigned long)&_driverdata, \ | 271 | .driver_data = (unsigned long)&_driverdata, \ |
272 | } | 272 | } |
273 | static DEFINE_PCI_DEVICE_TABLE(c_can_pci_tbl) = { | 273 | |
274 | static const struct pci_device_id c_can_pci_tbl[] = { | ||
274 | C_CAN_ID(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_CAN, | 275 | C_CAN_ID(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_CAN, |
275 | c_can_sta2x11), | 276 | c_can_sta2x11), |
276 | C_CAN_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PCH_CAN, | 277 | C_CAN_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PCH_CAN, |
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index 6472562efedc..a67eb01f3028 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c | |||
@@ -194,7 +194,7 @@ static const struct can_bittiming_const pch_can_bittiming_const = { | |||
194 | .brp_inc = 1, | 194 | .brp_inc = 1, |
195 | }; | 195 | }; |
196 | 196 | ||
197 | static DEFINE_PCI_DEVICE_TABLE(pch_pci_tbl) = { | 197 | static const struct pci_device_id pch_pci_tbl[] = { |
198 | {PCI_VENDOR_ID_INTEL, 0x8818, PCI_ANY_ID, PCI_ANY_ID,}, | 198 | {PCI_VENDOR_ID_INTEL, 0x8818, PCI_ANY_ID, PCI_ANY_ID,}, |
199 | {0,} | 199 | {0,} |
200 | }; | 200 | }; |
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c index fd13dbf07d9c..7481c324a476 100644 --- a/drivers/net/can/sja1000/ems_pci.c +++ b/drivers/net/can/sja1000/ems_pci.c | |||
@@ -101,7 +101,7 @@ struct ems_pci_card { | |||
101 | 101 | ||
102 | #define EMS_PCI_BASE_SIZE 4096 /* size of controller area */ | 102 | #define EMS_PCI_BASE_SIZE 4096 /* size of controller area */ |
103 | 103 | ||
104 | static DEFINE_PCI_DEVICE_TABLE(ems_pci_tbl) = { | 104 | static const struct pci_device_id ems_pci_tbl[] = { |
105 | /* CPC-PCI v1 */ | 105 | /* CPC-PCI v1 */ |
106 | {PCI_VENDOR_ID_SIEMENS, 0x2104, PCI_ANY_ID, PCI_ANY_ID,}, | 106 | {PCI_VENDOR_ID_SIEMENS, 0x2104, PCI_ANY_ID, PCI_ANY_ID,}, |
107 | /* CPC-PCI v2 */ | 107 | /* CPC-PCI v2 */ |
diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c index 23b8e1324e25..8ff3424d5147 100644 --- a/drivers/net/can/sja1000/kvaser_pci.c +++ b/drivers/net/can/sja1000/kvaser_pci.c | |||
@@ -107,7 +107,7 @@ struct kvaser_pci { | |||
107 | #define KVASER_PCI_VENDOR_ID2 0x1a07 /* the PCI device and vendor IDs */ | 107 | #define KVASER_PCI_VENDOR_ID2 0x1a07 /* the PCI device and vendor IDs */ |
108 | #define KVASER_PCI_DEVICE_ID2 0x0008 | 108 | #define KVASER_PCI_DEVICE_ID2 0x0008 |
109 | 109 | ||
110 | static DEFINE_PCI_DEVICE_TABLE(kvaser_pci_tbl) = { | 110 | static const struct pci_device_id kvaser_pci_tbl[] = { |
111 | {KVASER_PCI_VENDOR_ID1, KVASER_PCI_DEVICE_ID1, PCI_ANY_ID, PCI_ANY_ID,}, | 111 | {KVASER_PCI_VENDOR_ID1, KVASER_PCI_DEVICE_ID1, PCI_ANY_ID, PCI_ANY_ID,}, |
112 | {KVASER_PCI_VENDOR_ID2, KVASER_PCI_DEVICE_ID2, PCI_ANY_ID, PCI_ANY_ID,}, | 112 | {KVASER_PCI_VENDOR_ID2, KVASER_PCI_DEVICE_ID2, PCI_ANY_ID, PCI_ANY_ID,}, |
113 | { 0,} | 113 | { 0,} |
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c index 564933ae218c..7a85590fefb9 100644 --- a/drivers/net/can/sja1000/peak_pci.c +++ b/drivers/net/can/sja1000/peak_pci.c | |||
@@ -77,7 +77,7 @@ static const u16 peak_pci_icr_masks[PEAK_PCI_CHAN_MAX] = { | |||
77 | 0x02, 0x01, 0x40, 0x80 | 77 | 0x02, 0x01, 0x40, 0x80 |
78 | }; | 78 | }; |
79 | 79 | ||
80 | static DEFINE_PCI_DEVICE_TABLE(peak_pci_tbl) = { | 80 | static const struct pci_device_id peak_pci_tbl[] = { |
81 | {PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, | 81 | {PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, |
82 | {PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, | 82 | {PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, |
83 | {PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, | 83 | {PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, |
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c index ec39b7cb2287..8836a7485c81 100644 --- a/drivers/net/can/sja1000/plx_pci.c +++ b/drivers/net/can/sja1000/plx_pci.c | |||
@@ -247,7 +247,7 @@ static struct plx_pci_card_info plx_pci_card_info_elcus = { | |||
247 | /* based on PLX9030 */ | 247 | /* based on PLX9030 */ |
248 | }; | 248 | }; |
249 | 249 | ||
250 | static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl) = { | 250 | static const struct pci_device_id plx_pci_tbl[] = { |
251 | { | 251 | { |
252 | /* Adlink PCI-7841/cPCI-7841 */ | 252 | /* Adlink PCI-7841/cPCI-7841 */ |
253 | ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID, | 253 | ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID, |
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index 61477b8e8d24..059c7414e303 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c | |||
@@ -375,7 +375,7 @@ static struct vortex_chip_info { | |||
375 | }; | 375 | }; |
376 | 376 | ||
377 | 377 | ||
378 | static DEFINE_PCI_DEVICE_TABLE(vortex_pci_tbl) = { | 378 | static const struct pci_device_id vortex_pci_tbl[] = { |
379 | { 0x10B7, 0x5900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C590 }, | 379 | { 0x10B7, 0x5900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C590 }, |
380 | { 0x10B7, 0x5920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C592 }, | 380 | { 0x10B7, 0x5920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C592 }, |
381 | { 0x10B7, 0x5970, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C597 }, | 381 | { 0x10B7, 0x5970, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C597 }, |
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index e13b04624ded..48775b88bac7 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c | |||
@@ -203,7 +203,7 @@ static struct typhoon_card_info typhoon_card_info[] = { | |||
203 | * bit 8 indicates if this is a (0) copper or (1) fiber card | 203 | * bit 8 indicates if this is a (0) copper or (1) fiber card |
204 | * bits 12-16 indicate card type: (0) client and (1) server | 204 | * bits 12-16 indicate card type: (0) client and (1) server |
205 | */ | 205 | */ |
206 | static DEFINE_PCI_DEVICE_TABLE(typhoon_pci_tbl) = { | 206 | static const struct pci_device_id typhoon_pci_tbl[] = { |
207 | { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990, | 207 | { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990, |
208 | PCI_ANY_ID, PCI_ANY_ID, 0, 0,TYPHOON_TX }, | 208 | PCI_ANY_ID, PCI_ANY_ID, 0, 0,TYPHOON_TX }, |
209 | { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95, | 209 | { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95, |
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c index f395c967262e..89c8d9fc97de 100644 --- a/drivers/net/ethernet/8390/ne2k-pci.c +++ b/drivers/net/ethernet/8390/ne2k-pci.c | |||
@@ -135,7 +135,7 @@ static struct { | |||
135 | }; | 135 | }; |
136 | 136 | ||
137 | 137 | ||
138 | static DEFINE_PCI_DEVICE_TABLE(ne2k_pci_tbl) = { | 138 | static const struct pci_device_id ne2k_pci_tbl[] = { |
139 | { 0x10ec, 0x8029, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_RealTek_RTL_8029 }, | 139 | { 0x10ec, 0x8029, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_RealTek_RTL_8029 }, |
140 | { 0x1050, 0x0940, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940 }, | 140 | { 0x1050, 0x0940, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940 }, |
141 | { 0x11f6, 0x1401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Compex_RL2000 }, | 141 | { 0x11f6, 0x1401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Compex_RL2000 }, |
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index 40dbbf740331..ac7288240d55 100644 --- a/drivers/net/ethernet/adaptec/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c | |||
@@ -285,7 +285,7 @@ enum chipset { | |||
285 | CH_6915 = 0, | 285 | CH_6915 = 0, |
286 | }; | 286 | }; |
287 | 287 | ||
288 | static DEFINE_PCI_DEVICE_TABLE(starfire_pci_tbl) = { | 288 | static const struct pci_device_id starfire_pci_tbl[] = { |
289 | { PCI_VDEVICE(ADAPTEC, 0x6915), CH_6915 }, | 289 | { PCI_VDEVICE(ADAPTEC, 0x6915), CH_6915 }, |
290 | { 0, } | 290 | { 0, } |
291 | }; | 291 | }; |
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c index 9a6991be9749..b68074803de3 100644 --- a/drivers/net/ethernet/alteon/acenic.c +++ b/drivers/net/ethernet/alteon/acenic.c | |||
@@ -131,7 +131,7 @@ | |||
131 | #define PCI_DEVICE_ID_SGI_ACENIC 0x0009 | 131 | #define PCI_DEVICE_ID_SGI_ACENIC 0x0009 |
132 | #endif | 132 | #endif |
133 | 133 | ||
134 | static DEFINE_PCI_DEVICE_TABLE(acenic_pci_tbl) = { | 134 | static const struct pci_device_id acenic_pci_tbl[] = { |
135 | { PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_FIBRE, | 135 | { PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_FIBRE, |
136 | PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, }, | 136 | PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, }, |
137 | { PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_COPPER, | 137 | { PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_COPPER, |
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index 4a8fdc4721d5..e2e3aaf501a2 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c | |||
@@ -61,7 +61,7 @@ static const char *const version = | |||
61 | /* | 61 | /* |
62 | * PCI device identifiers for "new style" Linux PCI Device Drivers | 62 | * PCI device identifiers for "new style" Linux PCI Device Drivers |
63 | */ | 63 | */ |
64 | static DEFINE_PCI_DEVICE_TABLE(pcnet32_pci_tbl) = { | 64 | static const struct pci_device_id pcnet32_pci_tbl[] = { |
65 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), }, | 65 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), }, |
66 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), }, | 66 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), }, |
67 | 67 | ||
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c index 49faa97a30c3..e398eda07298 100644 --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c | |||
@@ -1527,7 +1527,7 @@ static const struct pci_error_handlers alx_err_handlers = { | |||
1527 | .resume = alx_pci_error_resume, | 1527 | .resume = alx_pci_error_resume, |
1528 | }; | 1528 | }; |
1529 | 1529 | ||
1530 | static DEFINE_PCI_DEVICE_TABLE(alx_pci_tbl) = { | 1530 | static const struct pci_device_id alx_pci_tbl[] = { |
1531 | { PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8161), | 1531 | { PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8161), |
1532 | .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG }, | 1532 | .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG }, |
1533 | { PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2200), | 1533 | { PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2200), |
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index e11bf18fbbd1..72fb86b9aa24 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -34,7 +34,7 @@ char atl1c_driver_version[] = ATL1C_DRV_VERSION; | |||
34 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, | 34 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, |
35 | * Class, Class Mask, private data (not used) } | 35 | * Class, Class Mask, private data (not used) } |
36 | */ | 36 | */ |
37 | static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = { | 37 | static const struct pci_device_id atl1c_pci_tbl[] = { |
38 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1C)}, | 38 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1C)}, |
39 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2C)}, | 39 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2C)}, |
40 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)}, | 40 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)}, |
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index 316e0c3fe048..2326579f9454 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c | |||
@@ -35,7 +35,7 @@ char atl1e_driver_version[] = DRV_VERSION; | |||
35 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, | 35 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, |
36 | * Class, Class Mask, private data (not used) } | 36 | * Class, Class Mask, private data (not used) } |
37 | */ | 37 | */ |
38 | static DEFINE_PCI_DEVICE_TABLE(atl1e_pci_tbl) = { | 38 | static const struct pci_device_id atl1e_pci_tbl[] = { |
39 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)}, | 39 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)}, |
40 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)}, | 40 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)}, |
41 | /* required last entry */ | 41 | /* required last entry */ |
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 1546d550ac97..2c8f398aeda9 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c | |||
@@ -235,7 +235,7 @@ static void atl1_check_options(struct atl1_adapter *adapter) | |||
235 | /* | 235 | /* |
236 | * atl1_pci_tbl - PCI Device ID Table | 236 | * atl1_pci_tbl - PCI Device ID Table |
237 | */ | 237 | */ |
238 | static DEFINE_PCI_DEVICE_TABLE(atl1_pci_tbl) = { | 238 | static const struct pci_device_id atl1_pci_tbl[] = { |
239 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1)}, | 239 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1)}, |
240 | /* required last entry */ | 240 | /* required last entry */ |
241 | {0,} | 241 | {0,} |
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c index c194bc687c30..84a09e8ddd9c 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c | |||
@@ -65,7 +65,7 @@ MODULE_VERSION(ATL2_DRV_VERSION); | |||
65 | /* | 65 | /* |
66 | * atl2_pci_tbl - PCI Device ID Table | 66 | * atl2_pci_tbl - PCI Device ID Table |
67 | */ | 67 | */ |
68 | static DEFINE_PCI_DEVICE_TABLE(atl2_pci_tbl) = { | 68 | static const struct pci_device_id atl2_pci_tbl[] = { |
69 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2)}, | 69 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L2)}, |
70 | /* required last entry */ | 70 | /* required last entry */ |
71 | {0,} | 71 | {0,} |
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index ca5a20a48b14..4a7028d65912 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c | |||
@@ -105,7 +105,7 @@ MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value"); | |||
105 | 105 | ||
106 | 106 | ||
107 | #ifdef CONFIG_B44_PCI | 107 | #ifdef CONFIG_B44_PCI |
108 | static DEFINE_PCI_DEVICE_TABLE(b44_pci_tbl) = { | 108 | static const struct pci_device_id b44_pci_tbl[] = { |
109 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401) }, | 109 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401) }, |
110 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B0) }, | 110 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B0) }, |
111 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1) }, | 111 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1) }, |
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index e64c963fe775..2fee73b878c2 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c | |||
@@ -120,7 +120,7 @@ static struct { | |||
120 | { "Broadcom NetXtreme II BCM5716 1000Base-SX" }, | 120 | { "Broadcom NetXtreme II BCM5716 1000Base-SX" }, |
121 | }; | 121 | }; |
122 | 122 | ||
123 | static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = { | 123 | static const struct pci_device_id bnx2_pci_tbl[] = { |
124 | { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706, | 124 | { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706, |
125 | PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T }, | 125 | PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T }, |
126 | { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706, | 126 | { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706, |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 3871ec49cc4d..c13364b6cc19 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
@@ -249,7 +249,7 @@ static struct { | |||
249 | #define PCI_DEVICE_ID_NX2_57811_VF CHIP_NUM_57811_VF | 249 | #define PCI_DEVICE_ID_NX2_57811_VF CHIP_NUM_57811_VF |
250 | #endif | 250 | #endif |
251 | 251 | ||
252 | static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = { | 252 | static const struct pci_device_id bnx2x_pci_tbl[] = { |
253 | { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 }, | 253 | { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 }, |
254 | { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 }, | 254 | { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 }, |
255 | { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711E), BCM57711E }, | 255 | { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711E), BCM57711E }, |
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index a3dd5dc64f4c..ba3cead67248 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -237,7 +237,7 @@ MODULE_PARM_DESC(tg3_debug, "Tigon3 bitmapped debugging message enable value"); | |||
237 | #define TG3_DRV_DATA_FLAG_10_100_ONLY 0x0001 | 237 | #define TG3_DRV_DATA_FLAG_10_100_ONLY 0x0001 |
238 | #define TG3_DRV_DATA_FLAG_5705_10_100 0x0002 | 238 | #define TG3_DRV_DATA_FLAG_5705_10_100 0x0002 |
239 | 239 | ||
240 | static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = { | 240 | static const struct pci_device_id tg3_pci_tbl[] = { |
241 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5700)}, | 241 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5700)}, |
242 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5701)}, | 242 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5701)}, |
243 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702)}, | 243 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702)}, |
@@ -15926,7 +15926,7 @@ static inline u32 tg3_rx_ret_ring_size(struct tg3 *tp) | |||
15926 | return TG3_RX_RET_MAX_SIZE_5705; | 15926 | return TG3_RX_RET_MAX_SIZE_5705; |
15927 | } | 15927 | } |
15928 | 15928 | ||
15929 | static DEFINE_PCI_DEVICE_TABLE(tg3_write_reorder_chipsets) = { | 15929 | static const struct pci_device_id tg3_write_reorder_chipsets[] = { |
15930 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_700C) }, | 15930 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_700C) }, |
15931 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE) }, | 15931 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE) }, |
15932 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8385_0) }, | 15932 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8385_0) }, |
@@ -17185,7 +17185,7 @@ static int tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dma, | |||
17185 | 17185 | ||
17186 | #define TEST_BUFFER_SIZE 0x2000 | 17186 | #define TEST_BUFFER_SIZE 0x2000 |
17187 | 17187 | ||
17188 | static DEFINE_PCI_DEVICE_TABLE(tg3_dma_wait_state_chipsets) = { | 17188 | static const struct pci_device_id tg3_dma_wait_state_chipsets[] = { |
17189 | { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI15) }, | 17189 | { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI15) }, |
17190 | { }, | 17190 | { }, |
17191 | }; | 17191 | }; |
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index 556aab75f490..ff8cae5e2535 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c | |||
@@ -3836,7 +3836,7 @@ bnad_pci_remove(struct pci_dev *pdev) | |||
3836 | free_netdev(netdev); | 3836 | free_netdev(netdev); |
3837 | } | 3837 | } |
3838 | 3838 | ||
3839 | static DEFINE_PCI_DEVICE_TABLE(bnad_pci_id_table) = { | 3839 | static const struct pci_device_id bnad_pci_id_table[] = { |
3840 | { | 3840 | { |
3841 | PCI_DEVICE(PCI_VENDOR_ID_BROCADE, | 3841 | PCI_DEVICE(PCI_VENDOR_ID_BROCADE, |
3842 | PCI_DEVICE_ID_BROCADE_CT), | 3842 | PCI_DEVICE_ID_BROCADE_CT), |
diff --git a/drivers/net/ethernet/chelsio/cxgb/subr.c b/drivers/net/ethernet/chelsio/cxgb/subr.c index 816719314cc8..ea0f8741d7cf 100644 --- a/drivers/net/ethernet/chelsio/cxgb/subr.c +++ b/drivers/net/ethernet/chelsio/cxgb/subr.c | |||
@@ -522,7 +522,7 @@ static const struct board_info t1_board[] = { | |||
522 | 522 | ||
523 | }; | 523 | }; |
524 | 524 | ||
525 | DEFINE_PCI_DEVICE_TABLE(t1_pci_tbl) = { | 525 | const struct pci_device_id t1_pci_tbl[] = { |
526 | CH_DEVICE(8, 0, CH_BRD_T110_1CU), | 526 | CH_DEVICE(8, 0, CH_BRD_T110_1CU), |
527 | CH_DEVICE(8, 1, CH_BRD_T110_1CU), | 527 | CH_DEVICE(8, 1, CH_BRD_T110_1CU), |
528 | CH_DEVICE(7, 0, CH_BRD_N110_1F), | 528 | CH_DEVICE(7, 0, CH_BRD_N110_1F), |
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 5d9cce053cc9..db76f7040455 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | |||
@@ -85,7 +85,7 @@ enum { | |||
85 | #define CH_DEVICE(devid, idx) \ | 85 | #define CH_DEVICE(devid, idx) \ |
86 | { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx } | 86 | { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx } |
87 | 87 | ||
88 | static DEFINE_PCI_DEVICE_TABLE(cxgb3_pci_tbl) = { | 88 | static const struct pci_device_id cxgb3_pci_tbl[] = { |
89 | CH_DEVICE(0x20, 0), /* PE9000 */ | 89 | CH_DEVICE(0x20, 0), /* PE9000 */ |
90 | CH_DEVICE(0x21, 1), /* T302E */ | 90 | CH_DEVICE(0x21, 1), /* T302E */ |
91 | CH_DEVICE(0x22, 2), /* T310E */ | 91 | CH_DEVICE(0x22, 2), /* T310E */ |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 1a162d21d8ac..8903e6832e90 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |||
@@ -212,7 +212,7 @@ struct filter_entry { | |||
212 | 212 | ||
213 | #define CH_DEVICE(devid, data) { PCI_VDEVICE(CHELSIO, devid), (data) } | 213 | #define CH_DEVICE(devid, data) { PCI_VDEVICE(CHELSIO, devid), (data) } |
214 | 214 | ||
215 | static DEFINE_PCI_DEVICE_TABLE(cxgb4_pci_tbl) = { | 215 | static const struct pci_device_id cxgb4_pci_tbl[] = { |
216 | CH_DEVICE(0xa000, 0), /* PE10K */ | 216 | CH_DEVICE(0xa000, 0), /* PE10K */ |
217 | CH_DEVICE(0x4001, -1), | 217 | CH_DEVICE(0x4001, -1), |
218 | CH_DEVICE(0x4002, -1), | 218 | CH_DEVICE(0x4002, -1), |
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c index d8d28e82ade1..2102a4c91737 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | |||
@@ -2910,7 +2910,7 @@ static void cxgb4vf_pci_shutdown(struct pci_dev *pdev) | |||
2910 | #define CH_DEVICE(devid, idx) \ | 2910 | #define CH_DEVICE(devid, idx) \ |
2911 | { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx } | 2911 | { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx } |
2912 | 2912 | ||
2913 | static DEFINE_PCI_DEVICE_TABLE(cxgb4vf_pci_tbl) = { | 2913 | static const struct pci_device_id cxgb4vf_pci_tbl[] = { |
2914 | CH_DEVICE(0xb000, 0), /* PE10K FPGA */ | 2914 | CH_DEVICE(0xb000, 0), /* PE10K FPGA */ |
2915 | CH_DEVICE(0x4800, 0), /* T440-dbg */ | 2915 | CH_DEVICE(0x4800, 0), /* T440-dbg */ |
2916 | CH_DEVICE(0x4801, 0), /* T420-cr */ | 2916 | CH_DEVICE(0x4801, 0), /* T420-cr */ |
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 9348febc0743..c8832bc1c5f7 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c | |||
@@ -67,7 +67,7 @@ | |||
67 | #define PCI_DEVICE_ID_CISCO_VIC_ENET_VF 0x0071 /* enet SRIOV VF */ | 67 | #define PCI_DEVICE_ID_CISCO_VIC_ENET_VF 0x0071 /* enet SRIOV VF */ |
68 | 68 | ||
69 | /* Supported devices */ | 69 | /* Supported devices */ |
70 | static DEFINE_PCI_DEVICE_TABLE(enic_id_table) = { | 70 | static const struct pci_device_id enic_id_table[] = { |
71 | { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) }, | 71 | { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) }, |
72 | { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_DYN) }, | 72 | { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_DYN) }, |
73 | { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_VF) }, | 73 | { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_VF) }, |
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c index 38148b0e3a95..a02ecc4f9002 100644 --- a/drivers/net/ethernet/dec/tulip/de2104x.c +++ b/drivers/net/ethernet/dec/tulip/de2104x.c | |||
@@ -340,7 +340,7 @@ static void de21041_media_timer (unsigned long data); | |||
340 | static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media); | 340 | static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media); |
341 | 341 | ||
342 | 342 | ||
343 | static DEFINE_PCI_DEVICE_TABLE(de_pci_tbl) = { | 343 | static const struct pci_device_id de_pci_tbl[] = { |
344 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP, | 344 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP, |
345 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 345 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
346 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS, | 346 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS, |
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index 7091fa6ed096..cf8b6ff21613 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c | |||
@@ -2328,7 +2328,7 @@ static void de4x5_pci_remove(struct pci_dev *pdev) | |||
2328 | pci_disable_device (pdev); | 2328 | pci_disable_device (pdev); |
2329 | } | 2329 | } |
2330 | 2330 | ||
2331 | static DEFINE_PCI_DEVICE_TABLE(de4x5_pci_tbl) = { | 2331 | static const struct pci_device_id de4x5_pci_tbl[] = { |
2332 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP, | 2332 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP, |
2333 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 2333 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
2334 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS, | 2334 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS, |
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c index 53f0c618045c..322213d901d5 100644 --- a/drivers/net/ethernet/dec/tulip/dmfe.c +++ b/drivers/net/ethernet/dec/tulip/dmfe.c | |||
@@ -2096,7 +2096,7 @@ static void dmfe_HPNA_remote_cmd_chk(struct dmfe_board_info * db) | |||
2096 | 2096 | ||
2097 | 2097 | ||
2098 | 2098 | ||
2099 | static DEFINE_PCI_DEVICE_TABLE(dmfe_pci_tbl) = { | 2099 | static const struct pci_device_id dmfe_pci_tbl[] = { |
2100 | { 0x1282, 0x9132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9132_ID }, | 2100 | { 0x1282, 0x9132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9132_ID }, |
2101 | { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9102_ID }, | 2101 | { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9102_ID }, |
2102 | { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9100_ID }, | 2102 | { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_DM9100_ID }, |
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 861660841ce2..3b42556f7f8d 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c | |||
@@ -207,7 +207,7 @@ struct tulip_chip_table tulip_tbl[] = { | |||
207 | }; | 207 | }; |
208 | 208 | ||
209 | 209 | ||
210 | static DEFINE_PCI_DEVICE_TABLE(tulip_pci_tbl) = { | 210 | static const struct pci_device_id tulip_pci_tbl[] = { |
211 | { 0x1011, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21140 }, | 211 | { 0x1011, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21140 }, |
212 | { 0x1011, 0x0019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21143 }, | 212 | { 0x1011, 0x0019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21143 }, |
213 | { 0x11AD, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, LC82C168 }, | 213 | { 0x11AD, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, LC82C168 }, |
@@ -1294,7 +1294,7 @@ static const struct net_device_ops tulip_netdev_ops = { | |||
1294 | #endif | 1294 | #endif |
1295 | }; | 1295 | }; |
1296 | 1296 | ||
1297 | DEFINE_PCI_DEVICE_TABLE(early_486_chipsets) = { | 1297 | const struct pci_device_id early_486_chipsets[] = { |
1298 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) }, | 1298 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) }, |
1299 | { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) }, | 1299 | { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) }, |
1300 | { }, | 1300 | { }, |
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c index 80afec335a11..4061f9b22812 100644 --- a/drivers/net/ethernet/dec/tulip/uli526x.c +++ b/drivers/net/ethernet/dec/tulip/uli526x.c | |||
@@ -1768,7 +1768,7 @@ static u16 phy_read_1bit(struct uli526x_board_info *db) | |||
1768 | } | 1768 | } |
1769 | 1769 | ||
1770 | 1770 | ||
1771 | static DEFINE_PCI_DEVICE_TABLE(uli526x_pci_tbl) = { | 1771 | static const struct pci_device_id uli526x_pci_tbl[] = { |
1772 | { 0x10B9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5261_ID }, | 1772 | { 0x10B9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5261_ID }, |
1773 | { 0x10B9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5263_ID }, | 1773 | { 0x10B9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5263_ID }, |
1774 | { 0, } | 1774 | { 0, } |
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index 62fe512bb216..6aa887e0e1cb 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c | |||
@@ -219,7 +219,7 @@ enum chip_capability_flags { | |||
219 | CanHaveMII=1, HasBrokenTx=2, AlwaysFDX=4, FDXOnNoMII=8, | 219 | CanHaveMII=1, HasBrokenTx=2, AlwaysFDX=4, FDXOnNoMII=8, |
220 | }; | 220 | }; |
221 | 221 | ||
222 | static DEFINE_PCI_DEVICE_TABLE(w840_pci_tbl) = { | 222 | static const struct pci_device_id w840_pci_tbl[] = { |
223 | { 0x1050, 0x0840, PCI_ANY_ID, 0x8153, 0, 0, 0 }, | 223 | { 0x1050, 0x0840, PCI_ANY_ID, 0x8153, 0, 0, 0 }, |
224 | { 0x1050, 0x0840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, | 224 | { 0x1050, 0x0840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, |
225 | { 0x11f6, 0x2011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 }, | 225 | { 0x11f6, 0x2011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 }, |
diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c index 6204cdfe43a6..0e721cedfa67 100644 --- a/drivers/net/ethernet/dec/tulip/xircom_cb.c +++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c | |||
@@ -137,7 +137,7 @@ static int link_status(struct xircom_private *card); | |||
137 | 137 | ||
138 | 138 | ||
139 | 139 | ||
140 | static DEFINE_PCI_DEVICE_TABLE(xircom_pci_table) = { | 140 | static const struct pci_device_id xircom_pci_table[] = { |
141 | { PCI_VDEVICE(XIRCOM, 0x0003), }, | 141 | { PCI_VDEVICE(XIRCOM, 0x0003), }, |
142 | {0,}, | 142 | {0,}, |
143 | }; | 143 | }; |
diff --git a/drivers/net/ethernet/dlink/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h index 7d07a0f5320d..23c07b007069 100644 --- a/drivers/net/ethernet/dlink/dl2k.h +++ b/drivers/net/ethernet/dlink/dl2k.h | |||
@@ -408,7 +408,7 @@ struct netdev_private { | |||
408 | driver_data Data private to the driver. | 408 | driver_data Data private to the driver. |
409 | */ | 409 | */ |
410 | 410 | ||
411 | static DEFINE_PCI_DEVICE_TABLE(rio_pci_tbl) = { | 411 | static const struct pci_device_id rio_pci_tbl[] = { |
412 | {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, }, | 412 | {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, }, |
413 | {0x13f0, 0x1021, PCI_ANY_ID, PCI_ANY_ID, }, | 413 | {0x13f0, 0x1021, PCI_ANY_ID, PCI_ANY_ID, }, |
414 | { } | 414 | { } |
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c index 433c1e185442..a28a2e583f0f 100644 --- a/drivers/net/ethernet/dlink/sundance.c +++ b/drivers/net/ethernet/dlink/sundance.c | |||
@@ -199,7 +199,7 @@ IVc. Errata | |||
199 | #define USE_IO_OPS 1 | 199 | #define USE_IO_OPS 1 |
200 | #endif | 200 | #endif |
201 | 201 | ||
202 | static DEFINE_PCI_DEVICE_TABLE(sundance_pci_tbl) = { | 202 | static const struct pci_device_id sundance_pci_tbl[] = { |
203 | { 0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0 }, | 203 | { 0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0 }, |
204 | { 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 }, | 204 | { 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 }, |
205 | { 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 }, | 205 | { 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 }, |
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index db4ff14ff18f..b06e54084d75 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c | |||
@@ -39,7 +39,7 @@ static ushort rx_frag_size = 2048; | |||
39 | module_param(rx_frag_size, ushort, S_IRUGO); | 39 | module_param(rx_frag_size, ushort, S_IRUGO); |
40 | MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data."); | 40 | MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data."); |
41 | 41 | ||
42 | static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = { | 42 | static const struct pci_device_id be_dev_ids[] = { |
43 | { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) }, | 43 | { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) }, |
44 | { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, | 44 | { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, |
45 | { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) }, | 45 | { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) }, |
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c index 4b22a9579f85..b1b9ebafb354 100644 --- a/drivers/net/ethernet/fealnx.c +++ b/drivers/net/ethernet/fealnx.c | |||
@@ -1936,7 +1936,7 @@ static int netdev_close(struct net_device *dev) | |||
1936 | return 0; | 1936 | return 0; |
1937 | } | 1937 | } |
1938 | 1938 | ||
1939 | static DEFINE_PCI_DEVICE_TABLE(fealnx_pci_tbl) = { | 1939 | static const struct pci_device_id fealnx_pci_tbl[] = { |
1940 | {0x1516, 0x0800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 1940 | {0x1516, 0x0800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
1941 | {0x1516, 0x0803, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, | 1941 | {0x1516, 0x0803, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, |
1942 | {0x1516, 0x0891, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, | 1942 | {0x1516, 0x0891, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, |
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c index 37860096f744..ed7916f6fbcf 100644 --- a/drivers/net/ethernet/hp/hp100.c +++ b/drivers/net/ethernet/hp/hp100.c | |||
@@ -208,7 +208,7 @@ MODULE_DEVICE_TABLE(eisa, hp100_eisa_tbl); | |||
208 | #endif | 208 | #endif |
209 | 209 | ||
210 | #ifdef CONFIG_PCI | 210 | #ifdef CONFIG_PCI |
211 | static DEFINE_PCI_DEVICE_TABLE(hp100_pci_tbl) = { | 211 | static const struct pci_device_id hp100_pci_tbl[] = { |
212 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585A, PCI_ANY_ID, PCI_ANY_ID,}, | 212 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585A, PCI_ANY_ID, PCI_ANY_ID,}, |
213 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585B, PCI_ANY_ID, PCI_ANY_ID,}, | 213 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585B, PCI_ANY_ID, PCI_ANY_ID,}, |
214 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2970A, PCI_ANY_ID, PCI_ANY_ID,}, | 214 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2970A, PCI_ANY_ID, PCI_ANY_ID,}, |
diff --git a/drivers/net/ethernet/icplus/ipg.c b/drivers/net/ethernet/icplus/ipg.c index 5727779a7df2..ff2903652f4b 100644 --- a/drivers/net/ethernet/icplus/ipg.c +++ b/drivers/net/ethernet/icplus/ipg.c | |||
@@ -95,7 +95,7 @@ static const char * const ipg_brand_name[] = { | |||
95 | "D-Link NIC IP1000A" | 95 | "D-Link NIC IP1000A" |
96 | }; | 96 | }; |
97 | 97 | ||
98 | static DEFINE_PCI_DEVICE_TABLE(ipg_pci_tbl) = { | 98 | static const struct pci_device_id ipg_pci_tbl[] = { |
99 | { PCI_VDEVICE(SUNDANCE, 0x1023), 0 }, | 99 | { PCI_VDEVICE(SUNDANCE, 0x1023), 0 }, |
100 | { PCI_VDEVICE(SUNDANCE, 0x2021), 1 }, | 100 | { PCI_VDEVICE(SUNDANCE, 0x2021), 1 }, |
101 | { PCI_VDEVICE(DLINK, 0x9021), 2 }, | 101 | { PCI_VDEVICE(DLINK, 0x9021), 2 }, |
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 9d979d7debef..781065eb5431 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c | |||
@@ -208,7 +208,7 @@ MODULE_PARM_DESC(use_io, "Force use of i/o access mode"); | |||
208 | #define INTEL_8255X_ETHERNET_DEVICE(device_id, ich) {\ | 208 | #define INTEL_8255X_ETHERNET_DEVICE(device_id, ich) {\ |
209 | PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \ | 209 | PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \ |
210 | PCI_CLASS_NETWORK_ETHERNET << 8, 0xFFFF00, ich } | 210 | PCI_CLASS_NETWORK_ETHERNET << 8, 0xFFFF00, ich } |
211 | static DEFINE_PCI_DEVICE_TABLE(e100_id_table) = { | 211 | static const struct pci_device_id e100_id_table[] = { |
212 | INTEL_8255X_ETHERNET_DEVICE(0x1029, 0), | 212 | INTEL_8255X_ETHERNET_DEVICE(0x1029, 0), |
213 | INTEL_8255X_ETHERNET_DEVICE(0x1030, 0), | 213 | INTEL_8255X_ETHERNET_DEVICE(0x1030, 0), |
214 | INTEL_8255X_ETHERNET_DEVICE(0x1031, 3), | 214 | INTEL_8255X_ETHERNET_DEVICE(0x1031, 3), |
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 660971f304b2..cbc330b301cd 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
@@ -46,7 +46,7 @@ static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation | |||
46 | * Macro expands to... | 46 | * Macro expands to... |
47 | * {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} | 47 | * {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} |
48 | */ | 48 | */ |
49 | static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = { | 49 | static const struct pci_device_id e1000_pci_tbl[] = { |
50 | INTEL_E1000_ETHERNET_DEVICE(0x1000), | 50 | INTEL_E1000_ETHERNET_DEVICE(0x1000), |
51 | INTEL_E1000_ETHERNET_DEVICE(0x1001), | 51 | INTEL_E1000_ETHERNET_DEVICE(0x1001), |
52 | INTEL_E1000_ETHERNET_DEVICE(0x1004), | 52 | INTEL_E1000_ETHERNET_DEVICE(0x1004), |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 51bc03072ed3..d9f497210303 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
@@ -65,7 +65,7 @@ static int i40e_veb_get_bw_info(struct i40e_veb *veb); | |||
65 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, | 65 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, |
66 | * Class, Class Mask, private data (not used) } | 66 | * Class, Class Mask, private data (not used) } |
67 | */ | 67 | */ |
68 | static DEFINE_PCI_DEVICE_TABLE(i40e_pci_tbl) = { | 68 | static const struct pci_device_id i40e_pci_tbl[] = { |
69 | {PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_XL710), 0}, | 69 | {PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_XL710), 0}, |
70 | {PCI_VDEVICE(INTEL, I40E_DEV_ID_QEMU), 0}, | 70 | {PCI_VDEVICE(INTEL, I40E_DEV_ID_QEMU), 0}, |
71 | {PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_A), 0}, | 71 | {PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_A), 0}, |
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index ab15f4d07e41..38429fae4fcf 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c | |||
@@ -49,7 +49,7 @@ static const char i40evf_copyright[] = | |||
49 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, | 49 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, |
50 | * Class, Class Mask, private data (not used) } | 50 | * Class, Class Mask, private data (not used) } |
51 | */ | 51 | */ |
52 | static DEFINE_PCI_DEVICE_TABLE(i40evf_pci_tbl) = { | 52 | static const struct pci_device_id i40evf_pci_tbl[] = { |
53 | {PCI_VDEVICE(INTEL, I40E_DEV_ID_VF), 0}, | 53 | {PCI_VDEVICE(INTEL, I40E_DEV_ID_VF), 0}, |
54 | /* required last entry */ | 54 | /* required last entry */ |
55 | {0, } | 55 | {0, } |
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index d608599e123a..63c807c9b21c 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c | |||
@@ -2853,7 +2853,7 @@ static const struct pci_error_handlers igbvf_err_handler = { | |||
2853 | .resume = igbvf_io_resume, | 2853 | .resume = igbvf_io_resume, |
2854 | }; | 2854 | }; |
2855 | 2855 | ||
2856 | static DEFINE_PCI_DEVICE_TABLE(igbvf_pci_tbl) = { | 2856 | static const struct pci_device_id igbvf_pci_tbl[] = { |
2857 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_VF), board_vf }, | 2857 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_VF), board_vf }, |
2858 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_VF), board_i350_vf }, | 2858 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_VF), board_i350_vf }, |
2859 | { } /* terminate list */ | 2859 | { } /* terminate list */ |
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index 60801273915c..055961b0f24b 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c | |||
@@ -53,7 +53,7 @@ MODULE_PARM_DESC(copybreak, | |||
53 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, | 53 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, |
54 | * Class, Class Mask, private data (not used) } | 54 | * Class, Class Mask, private data (not used) } |
55 | */ | 55 | */ |
56 | static DEFINE_PCI_DEVICE_TABLE(ixgb_pci_tbl) = { | 56 | static const struct pci_device_id ixgb_pci_tbl[] = { |
57 | {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX, | 57 | {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX, |
58 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 58 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
59 | {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_CX4, | 59 | {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_CX4, |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 5384ed30298a..87bd53fdd209 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -84,7 +84,7 @@ static const struct ixgbe_info *ixgbe_info_tbl[] = { | |||
84 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, | 84 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, |
85 | * Class, Class Mask, private data (not used) } | 85 | * Class, Class Mask, private data (not used) } |
86 | */ | 86 | */ |
87 | static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { | 87 | static const struct pci_device_id ixgbe_pci_tbl[] = { |
88 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598), board_82598 }, | 88 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598), board_82598 }, |
89 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT), board_82598 }, | 89 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT), board_82598 }, |
90 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT), board_82598 }, | 90 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT), board_82598 }, |
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 75467f83772c..c22a00c3621a 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |||
@@ -76,7 +76,7 @@ static const struct ixgbevf_info *ixgbevf_info_tbl[] = { | |||
76 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, | 76 | * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, |
77 | * Class, Class Mask, private data (not used) } | 77 | * Class, Class Mask, private data (not used) } |
78 | */ | 78 | */ |
79 | static DEFINE_PCI_DEVICE_TABLE(ixgbevf_pci_tbl) = { | 79 | static const struct pci_device_id ixgbevf_pci_tbl[] = { |
80 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_VF), board_82599_vf }, | 80 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_VF), board_82599_vf }, |
81 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF), board_X540_vf }, | 81 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF), board_X540_vf }, |
82 | /* required last entry */ | 82 | /* required last entry */ |
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index b78378cea5e3..4a1be34d7214 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c | |||
@@ -3334,7 +3334,7 @@ static SIMPLE_DEV_PM_OPS(jme_pm_ops, jme_suspend, jme_resume); | |||
3334 | #define JME_PM_OPS NULL | 3334 | #define JME_PM_OPS NULL |
3335 | #endif | 3335 | #endif |
3336 | 3336 | ||
3337 | static DEFINE_PCI_DEVICE_TABLE(jme_pci_tbl) = { | 3337 | static const struct pci_device_id jme_pci_tbl[] = { |
3338 | { PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC250) }, | 3338 | { PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC250) }, |
3339 | { PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC260) }, | 3339 | { PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC260) }, |
3340 | { } | 3340 | { } |
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index e912b6887d40..24b242277ea1 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c | |||
@@ -82,7 +82,7 @@ static int debug = -1; /* defaults above */ | |||
82 | module_param(debug, int, 0); | 82 | module_param(debug, int, 0); |
83 | MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); | 83 | MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); |
84 | 84 | ||
85 | static DEFINE_PCI_DEVICE_TABLE(skge_id_table) = { | 85 | static const struct pci_device_id skge_id_table[] = { |
86 | { PCI_DEVICE(PCI_VENDOR_ID_3COM, 0x1700) }, /* 3Com 3C940 */ | 86 | { PCI_DEVICE(PCI_VENDOR_ID_3COM, 0x1700) }, /* 3Com 3C940 */ |
87 | { PCI_DEVICE(PCI_VENDOR_ID_3COM, 0x80EB) }, /* 3Com 3C940B */ | 87 | { PCI_DEVICE(PCI_VENDOR_ID_3COM, 0x80EB) }, /* 3Com 3C940B */ |
88 | #ifdef CONFIG_SKGE_GENESIS | 88 | #ifdef CONFIG_SKGE_GENESIS |
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 59915144aabb..dba48a5ce7ab 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c | |||
@@ -101,7 +101,7 @@ static int legacy_pme = 0; | |||
101 | module_param(legacy_pme, int, 0); | 101 | module_param(legacy_pme, int, 0); |
102 | MODULE_PARM_DESC(legacy_pme, "Legacy power management"); | 102 | MODULE_PARM_DESC(legacy_pme, "Legacy power management"); |
103 | 103 | ||
104 | static DEFINE_PCI_DEVICE_TABLE(sky2_id_table) = { | 104 | static const struct pci_device_id sky2_id_table[] = { |
105 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */ | 105 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */ |
106 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */ | 106 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */ |
107 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E01) }, /* SK-9E21M */ | 107 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E01) }, /* SK-9E21M */ |
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 80b8c5f30e4e..110e0205c427 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c | |||
@@ -2727,7 +2727,7 @@ int mlx4_restart_one(struct pci_dev *pdev) | |||
2727 | return __mlx4_init_one(pdev, pci_dev_data); | 2727 | return __mlx4_init_one(pdev, pci_dev_data); |
2728 | } | 2728 | } |
2729 | 2729 | ||
2730 | static DEFINE_PCI_DEVICE_TABLE(mlx4_pci_table) = { | 2730 | static const struct pci_device_id mlx4_pci_table[] = { |
2731 | /* MT25408 "Hermon" SDR */ | 2731 | /* MT25408 "Hermon" SDR */ |
2732 | { PCI_VDEVICE(MELLANOX, 0x6340), MLX4_PCI_DEV_FORCE_SENSE_PORT }, | 2732 | { PCI_VDEVICE(MELLANOX, 0x6340), MLX4_PCI_DEV_FORCE_SENSE_PORT }, |
2733 | /* MT25408 "Hermon" DDR */ | 2733 | /* MT25408 "Hermon" DDR */ |
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index cd5f106306d9..f1ebed6c63b1 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c | |||
@@ -7221,7 +7221,7 @@ static int pcidev_suspend(struct pci_dev *pdev, pm_message_t state) | |||
7221 | 7221 | ||
7222 | static char pcidev_name[] = "ksz884xp"; | 7222 | static char pcidev_name[] = "ksz884xp"; |
7223 | 7223 | ||
7224 | static DEFINE_PCI_DEVICE_TABLE(pcidev_table) = { | 7224 | static const struct pci_device_id pcidev_table[] = { |
7225 | { PCI_VENDOR_ID_MICREL_KS, 0x8841, | 7225 | { PCI_VENDOR_ID_MICREL_KS, 0x8841, |
7226 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 7226 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
7227 | { PCI_VENDOR_ID_MICREL_KS, 0x8842, | 7227 | { PCI_VENDOR_ID_MICREL_KS, 0x8842, |
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index f3d5d79f1cd1..442100450a51 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c | |||
@@ -4213,7 +4213,7 @@ static void myri10ge_remove(struct pci_dev *pdev) | |||
4213 | #define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E 0x0008 | 4213 | #define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E 0x0008 |
4214 | #define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9 0x0009 | 4214 | #define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9 0x0009 |
4215 | 4215 | ||
4216 | static DEFINE_PCI_DEVICE_TABLE(myri10ge_pci_tbl) = { | 4216 | static const struct pci_device_id myri10ge_pci_tbl[] = { |
4217 | {PCI_DEVICE(PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E)}, | 4217 | {PCI_DEVICE(PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E)}, |
4218 | {PCI_DEVICE | 4218 | {PCI_DEVICE |
4219 | (PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9)}, | 4219 | (PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9)}, |
diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c index 291fba8b9f07..b83f7c0fcf99 100644 --- a/drivers/net/ethernet/natsemi/natsemi.c +++ b/drivers/net/ethernet/natsemi/natsemi.c | |||
@@ -247,7 +247,7 @@ static struct { | |||
247 | { "NatSemi DP8381[56]", 0, 24 }, | 247 | { "NatSemi DP8381[56]", 0, 24 }, |
248 | }; | 248 | }; |
249 | 249 | ||
250 | static DEFINE_PCI_DEVICE_TABLE(natsemi_pci_tbl) = { | 250 | static const struct pci_device_id natsemi_pci_tbl[] = { |
251 | { PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 }, | 251 | { PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 }, |
252 | { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, | 252 | { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, |
253 | { } /* terminate list */ | 253 | { } /* terminate list */ |
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c index 19bb8244b9e3..2552e550a78c 100644 --- a/drivers/net/ethernet/natsemi/ns83820.c +++ b/drivers/net/ethernet/natsemi/ns83820.c | |||
@@ -2260,7 +2260,7 @@ static void ns83820_remove_one(struct pci_dev *pci_dev) | |||
2260 | free_netdev(ndev); | 2260 | free_netdev(ndev); |
2261 | } | 2261 | } |
2262 | 2262 | ||
2263 | static DEFINE_PCI_DEVICE_TABLE(ns83820_pci_tbl) = { | 2263 | static const struct pci_device_id ns83820_pci_tbl[] = { |
2264 | { 0x100b, 0x0022, PCI_ANY_ID, PCI_ANY_ID, 0, .driver_data = 0, }, | 2264 | { 0x100b, 0x0022, PCI_ANY_ID, PCI_ANY_ID, 0, .driver_data = 0, }, |
2265 | { 0, }, | 2265 | { 0, }, |
2266 | }; | 2266 | }; |
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index be587647c706..f5e4b820128b 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c | |||
@@ -471,7 +471,7 @@ module_param_array(rts_frm_len, uint, NULL, 0); | |||
471 | * S2IO device table. | 471 | * S2IO device table. |
472 | * This table lists all the devices that this driver supports. | 472 | * This table lists all the devices that this driver supports. |
473 | */ | 473 | */ |
474 | static DEFINE_PCI_DEVICE_TABLE(s2io_tbl) = { | 474 | static const struct pci_device_id s2io_tbl[] = { |
475 | {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_S2IO_WIN, | 475 | {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_S2IO_WIN, |
476 | PCI_ANY_ID, PCI_ANY_ID}, | 476 | PCI_ANY_ID, PCI_ANY_ID}, |
477 | {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_S2IO_UNI, | 477 | {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_S2IO_UNI, |
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index 2eda153cb1e0..4f40d7b8629e 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c | |||
@@ -63,7 +63,7 @@ MODULE_LICENSE("Dual BSD/GPL"); | |||
63 | MODULE_DESCRIPTION("Neterion's X3100 Series 10GbE PCIe I/O" | 63 | MODULE_DESCRIPTION("Neterion's X3100 Series 10GbE PCIe I/O" |
64 | "Virtualized Server Adapter"); | 64 | "Virtualized Server Adapter"); |
65 | 65 | ||
66 | static DEFINE_PCI_DEVICE_TABLE(vxge_id_table) = { | 66 | static const struct pci_device_id vxge_id_table[] = { |
67 | {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_TITAN_WIN, PCI_ANY_ID, | 67 | {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_TITAN_WIN, PCI_ANY_ID, |
68 | PCI_ANY_ID}, | 68 | PCI_ANY_ID}, |
69 | {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_TITAN_UNI, PCI_ANY_ID, | 69 | {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_TITAN_UNI, PCI_ANY_ID, |
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 9afc536c5734..925b296d8ab8 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
@@ -6185,7 +6185,7 @@ static void nv_shutdown(struct pci_dev *pdev) | |||
6185 | #define nv_shutdown NULL | 6185 | #define nv_shutdown NULL |
6186 | #endif /* CONFIG_PM */ | 6186 | #endif /* CONFIG_PM */ |
6187 | 6187 | ||
6188 | static DEFINE_PCI_DEVICE_TABLE(pci_tbl) = { | 6188 | static const struct pci_device_id pci_tbl[] = { |
6189 | { /* nForce Ethernet Controller */ | 6189 | { /* nForce Ethernet Controller */ |
6190 | PCI_DEVICE(0x10DE, 0x01C3), | 6190 | PCI_DEVICE(0x10DE, 0x01C3), |
6191 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, | 6191 | .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 73e66838cfef..3b98b263bad0 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | |||
@@ -2743,7 +2743,7 @@ static struct pch_gbe_privdata pch_gbe_minnow_privdata = { | |||
2743 | .platform_init = pch_gbe_minnow_platform_init, | 2743 | .platform_init = pch_gbe_minnow_platform_init, |
2744 | }; | 2744 | }; |
2745 | 2745 | ||
2746 | static DEFINE_PCI_DEVICE_TABLE(pch_gbe_pcidev_id) = { | 2746 | static const struct pci_device_id pch_gbe_pcidev_id[] = { |
2747 | {.vendor = PCI_VENDOR_ID_INTEL, | 2747 | {.vendor = PCI_VENDOR_ID_INTEL, |
2748 | .device = PCI_DEVICE_ID_INTEL_IOH1_GBE, | 2748 | .device = PCI_DEVICE_ID_INTEL_IOH1_GBE, |
2749 | .subvendor = PCI_VENDOR_ID_CIRCUITCO, | 2749 | .subvendor = PCI_VENDOR_ID_CIRCUITCO, |
diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c index 9a997e4c3e08..319d9d40f922 100644 --- a/drivers/net/ethernet/packetengines/hamachi.c +++ b/drivers/net/ethernet/packetengines/hamachi.c | |||
@@ -1911,7 +1911,7 @@ static void hamachi_remove_one(struct pci_dev *pdev) | |||
1911 | } | 1911 | } |
1912 | } | 1912 | } |
1913 | 1913 | ||
1914 | static DEFINE_PCI_DEVICE_TABLE(hamachi_pci_tbl) = { | 1914 | static const struct pci_device_id hamachi_pci_tbl[] = { |
1915 | { 0x1318, 0x0911, PCI_ANY_ID, PCI_ANY_ID, }, | 1915 | { 0x1318, 0x0911, PCI_ANY_ID, PCI_ANY_ID, }, |
1916 | { 0, } | 1916 | { 0, } |
1917 | }; | 1917 | }; |
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c index 69a8dc095072..2d6b148528dd 100644 --- a/drivers/net/ethernet/packetengines/yellowfin.c +++ b/drivers/net/ethernet/packetengines/yellowfin.c | |||
@@ -236,7 +236,7 @@ static const struct pci_id_info pci_id_tbl[] = { | |||
236 | { } | 236 | { } |
237 | }; | 237 | }; |
238 | 238 | ||
239 | static DEFINE_PCI_DEVICE_TABLE(yellowfin_pci_tbl) = { | 239 | static const struct pci_device_id yellowfin_pci_tbl[] = { |
240 | { 0x1000, 0x0702, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 240 | { 0x1000, 0x0702, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
241 | { 0x1000, 0x0701, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, | 241 | { 0x1000, 0x0701, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, |
242 | { } | 242 | { } |
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c index 9abf70d74b31..30d934d66356 100644 --- a/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/drivers/net/ethernet/pasemi/pasemi_mac.c | |||
@@ -1871,7 +1871,7 @@ static void pasemi_mac_remove(struct pci_dev *pdev) | |||
1871 | free_netdev(netdev); | 1871 | free_netdev(netdev); |
1872 | } | 1872 | } |
1873 | 1873 | ||
1874 | static DEFINE_PCI_DEVICE_TABLE(pasemi_mac_pci_tbl) = { | 1874 | static const struct pci_device_id pasemi_mac_pci_tbl[] = { |
1875 | { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa005) }, | 1875 | { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa005) }, |
1876 | { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa006) }, | 1876 | { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa006) }, |
1877 | { }, | 1877 | { }, |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 5bf05818a12c..1159031f885b 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |||
@@ -99,7 +99,7 @@ static int netxen_nic_set_mac(struct net_device *netdev, void *p); | |||
99 | {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \ | 99 | {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \ |
100 | .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} | 100 | .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} |
101 | 101 | ||
102 | static DEFINE_PCI_DEVICE_TABLE(netxen_pci_tbl) = { | 102 | static const struct pci_device_id netxen_pci_tbl[] = { |
103 | ENTRY(PCI_DEVICE_ID_NX2031_10GXSR), | 103 | ENTRY(PCI_DEVICE_ID_NX2031_10GXSR), |
104 | ENTRY(PCI_DEVICE_ID_NX2031_10GCX4), | 104 | ENTRY(PCI_DEVICE_ID_NX2031_10GCX4), |
105 | ENTRY(PCI_DEVICE_ID_NX2031_4GCU), | 105 | ENTRY(PCI_DEVICE_ID_NX2031_4GCU), |
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index b5d6bc1a8b00..c2f09af5c25b 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c | |||
@@ -65,7 +65,7 @@ static int msi; | |||
65 | module_param(msi, int, 0); | 65 | module_param(msi, int, 0); |
66 | MODULE_PARM_DESC(msi, "Turn on Message Signaled Interrupts."); | 66 | MODULE_PARM_DESC(msi, "Turn on Message Signaled Interrupts."); |
67 | 67 | ||
68 | static DEFINE_PCI_DEVICE_TABLE(ql3xxx_pci_tbl) = { | 68 | static const struct pci_device_id ql3xxx_pci_tbl[] = { |
69 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3022_DEVICE_ID)}, | 69 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3022_DEVICE_ID)}, |
70 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3032_DEVICE_ID)}, | 70 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QL3032_DEVICE_ID)}, |
71 | /* required last entry */ | 71 | /* required last entry */ |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 59846daf1379..cf08b2de071e 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -108,7 +108,7 @@ static u32 qlcnic_vlan_tx_check(struct qlcnic_adapter *adapter) | |||
108 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \ | 108 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \ |
109 | .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} | 109 | .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} |
110 | 110 | ||
111 | static DEFINE_PCI_DEVICE_TABLE(qlcnic_pci_tbl) = { | 111 | static const struct pci_device_id qlcnic_pci_tbl[] = { |
112 | ENTRY(PCI_DEVICE_ID_QLOGIC_QLE824X), | 112 | ENTRY(PCI_DEVICE_ID_QLOGIC_QLE824X), |
113 | ENTRY(PCI_DEVICE_ID_QLOGIC_QLE834X), | 113 | ENTRY(PCI_DEVICE_ID_QLOGIC_QLE834X), |
114 | ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE834X), | 114 | ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE834X), |
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index d836ace52277..188626e2a861 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c | |||
@@ -86,7 +86,7 @@ MODULE_PARM_DESC(qlge_force_coredump, | |||
86 | "Option to allow force of firmware core dump. " | 86 | "Option to allow force of firmware core dump. " |
87 | "Default is OFF - Do not allow."); | 87 | "Default is OFF - Do not allow."); |
88 | 88 | ||
89 | static DEFINE_PCI_DEVICE_TABLE(qlge_pci_tbl) = { | 89 | static const struct pci_device_id qlge_pci_tbl[] = { |
90 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8012)}, | 90 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8012)}, |
91 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8000)}, | 91 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8000)}, |
92 | /* required last entry */ | 92 | /* required last entry */ |
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index cd045ecb9816..9a37247cf4b8 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c | |||
@@ -1254,7 +1254,7 @@ static void r6040_remove_one(struct pci_dev *pdev) | |||
1254 | } | 1254 | } |
1255 | 1255 | ||
1256 | 1256 | ||
1257 | static DEFINE_PCI_DEVICE_TABLE(r6040_pci_tbl) = { | 1257 | static const struct pci_device_id r6040_pci_tbl[] = { |
1258 | { PCI_DEVICE(PCI_VENDOR_ID_RDC, 0x6040) }, | 1258 | { PCI_DEVICE(PCI_VENDOR_ID_RDC, 0x6040) }, |
1259 | { 0 } | 1259 | { 0 } |
1260 | }; | 1260 | }; |
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c index 2e5df148af4c..007b38cce69a 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c | |||
@@ -234,7 +234,7 @@ static const struct { | |||
234 | }; | 234 | }; |
235 | 235 | ||
236 | 236 | ||
237 | static DEFINE_PCI_DEVICE_TABLE(rtl8139_pci_tbl) = { | 237 | static const struct pci_device_id rtl8139_pci_tbl[] = { |
238 | {0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, | 238 | {0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, |
239 | {0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, | 239 | {0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, |
240 | {0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, | 240 | {0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, |
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 9887bcb45b84..91652e7235e4 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
@@ -291,7 +291,7 @@ enum cfg_version { | |||
291 | RTL_CFG_2 | 291 | RTL_CFG_2 |
292 | }; | 292 | }; |
293 | 293 | ||
294 | static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = { | 294 | static const struct pci_device_id rtl8169_pci_tbl[] = { |
295 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 }, | 295 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 }, |
296 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8136), 0, 0, RTL_CFG_2 }, | 296 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8136), 0, 0, RTL_CFG_2 }, |
297 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 }, | 297 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 }, |
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 4cebe9d37816..b2cc590dd1dd 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c | |||
@@ -2642,7 +2642,7 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type) | |||
2642 | **************************************************************************/ | 2642 | **************************************************************************/ |
2643 | 2643 | ||
2644 | /* PCI device ID table */ | 2644 | /* PCI device ID table */ |
2645 | static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = { | 2645 | static const struct pci_device_id efx_pci_table[] = { |
2646 | {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, | 2646 | {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, |
2647 | PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0), | 2647 | PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0), |
2648 | .driver_data = (unsigned long) &falcon_a1_nic_type}, | 2648 | .driver_data = (unsigned long) &falcon_a1_nic_type}, |
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c index 7984ad05357d..7a254da85dd7 100644 --- a/drivers/net/ethernet/sgi/ioc3-eth.c +++ b/drivers/net/ethernet/sgi/ioc3-eth.c | |||
@@ -1384,7 +1384,7 @@ static void ioc3_remove_one(struct pci_dev *pdev) | |||
1384 | */ | 1384 | */ |
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | static DEFINE_PCI_DEVICE_TABLE(ioc3_pci_tbl) = { | 1387 | static const struct pci_device_id ioc3_pci_tbl[] = { |
1388 | { PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, PCI_ANY_ID, PCI_ANY_ID }, | 1388 | { PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, PCI_ANY_ID, PCI_ANY_ID }, |
1389 | { 0 } | 1389 | { 0 } |
1390 | }; | 1390 | }; |
diff --git a/drivers/net/ethernet/silan/sc92031.c b/drivers/net/ethernet/silan/sc92031.c index 7daa7d433099..7426f8b21252 100644 --- a/drivers/net/ethernet/silan/sc92031.c +++ b/drivers/net/ethernet/silan/sc92031.c | |||
@@ -1561,7 +1561,7 @@ out: | |||
1561 | return 0; | 1561 | return 0; |
1562 | } | 1562 | } |
1563 | 1563 | ||
1564 | static DEFINE_PCI_DEVICE_TABLE(sc92031_pci_device_id_table) = { | 1564 | static const struct pci_device_id sc92031_pci_device_id_table[] = { |
1565 | { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x2031) }, | 1565 | { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x2031) }, |
1566 | { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x8139) }, | 1566 | { PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x8139) }, |
1567 | { PCI_DEVICE(0x1088, 0x2031) }, | 1567 | { PCI_DEVICE(0x1088, 0x2031) }, |
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c index a86339903b9b..27be6c869315 100644 --- a/drivers/net/ethernet/sis/sis190.c +++ b/drivers/net/ethernet/sis/sis190.c | |||
@@ -330,7 +330,7 @@ static const struct { | |||
330 | { "SiS 191 PCI Gigabit Ethernet adapter" }, | 330 | { "SiS 191 PCI Gigabit Ethernet adapter" }, |
331 | }; | 331 | }; |
332 | 332 | ||
333 | static DEFINE_PCI_DEVICE_TABLE(sis190_pci_tbl) = { | 333 | static const struct pci_device_id sis190_pci_tbl[] = { |
334 | { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 }, | 334 | { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 }, |
335 | { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 }, | 335 | { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 }, |
336 | { 0, }, | 336 | { 0, }, |
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c index 7bea17c41dc9..fd812d2e5e1c 100644 --- a/drivers/net/ethernet/sis/sis900.c +++ b/drivers/net/ethernet/sis/sis900.c | |||
@@ -106,7 +106,8 @@ static const char * card_names[] = { | |||
106 | "SiS 900 PCI Fast Ethernet", | 106 | "SiS 900 PCI Fast Ethernet", |
107 | "SiS 7016 PCI Fast Ethernet" | 107 | "SiS 7016 PCI Fast Ethernet" |
108 | }; | 108 | }; |
109 | static DEFINE_PCI_DEVICE_TABLE(sis900_pci_tbl) = { | 109 | |
110 | static const struct pci_device_id sis900_pci_tbl[] = { | ||
110 | {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_900, | 111 | {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_900, |
111 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_900}, | 112 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_900}, |
112 | {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7016, | 113 | {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7016, |
diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c index 8ae1f8a7bf38..443f1da9fc9e 100644 --- a/drivers/net/ethernet/smsc/epic100.c +++ b/drivers/net/ethernet/smsc/epic100.c | |||
@@ -173,7 +173,7 @@ static const struct epic_chip_info pci_id_tbl[] = { | |||
173 | }; | 173 | }; |
174 | 174 | ||
175 | 175 | ||
176 | static DEFINE_PCI_DEVICE_TABLE(epic_pci_tbl) = { | 176 | static const struct pci_device_id epic_pci_tbl[] = { |
177 | { 0x10B8, 0x0005, 0x1092, 0x0AB4, 0, 0, SMSC_83C170_0 }, | 177 | { 0x10B8, 0x0005, 0x1092, 0x0AB4, 0, 0, SMSC_83C170_0 }, |
178 | { 0x10B8, 0x0005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SMSC_83C170 }, | 178 | { 0x10B8, 0x0005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SMSC_83C170 }, |
179 | { 0x10B8, 0x0006, PCI_ANY_ID, PCI_ANY_ID, | 179 | { 0x10B8, 0x0006, PCI_ANY_ID, PCI_ANY_ID, |
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c index d3b967aff9e0..4a90cdae5444 100644 --- a/drivers/net/ethernet/smsc/smsc9420.c +++ b/drivers/net/ethernet/smsc/smsc9420.c | |||
@@ -83,7 +83,7 @@ struct smsc9420_pdata { | |||
83 | int last_carrier; | 83 | int last_carrier; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | static DEFINE_PCI_DEVICE_TABLE(smsc9420_id_table) = { | 86 | static const struct pci_device_id smsc9420_id_table[] = { |
87 | { PCI_VENDOR_ID_9420, PCI_DEVICE_ID_9420, PCI_ANY_ID, PCI_ANY_ID, }, | 87 | { PCI_VENDOR_ID_9420, PCI_DEVICE_ID_9420, PCI_ANY_ID, PCI_ANY_ID, }, |
88 | { 0, } | 88 | { 0, } |
89 | }; | 89 | }; |
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index 291608924849..655a23bbc451 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | |||
@@ -170,7 +170,7 @@ static int stmmac_pci_resume(struct pci_dev *pdev) | |||
170 | #define STMMAC_VENDOR_ID 0x700 | 170 | #define STMMAC_VENDOR_ID 0x700 |
171 | #define STMMAC_DEVICE_ID 0x1108 | 171 | #define STMMAC_DEVICE_ID 0x1108 |
172 | 172 | ||
173 | static DEFINE_PCI_DEVICE_TABLE(stmmac_id_table) = { | 173 | static const struct pci_device_id stmmac_id_table[] = { |
174 | {PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)}, | 174 | {PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)}, |
175 | {PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_MAC)}, | 175 | {PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_MAC)}, |
176 | {} | 176 | {} |
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index b9ac20f42651..37f87ff28f03 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c | |||
@@ -229,7 +229,7 @@ static u16 link_modes[] = { | |||
229 | CAS_BMCR_SPEED1000|BMCR_FULLDPLX /* 5 : 1000bt full duplex */ | 229 | CAS_BMCR_SPEED1000|BMCR_FULLDPLX /* 5 : 1000bt full duplex */ |
230 | }; | 230 | }; |
231 | 231 | ||
232 | static DEFINE_PCI_DEVICE_TABLE(cas_pci_tbl) = { | 232 | static const struct pci_device_id cas_pci_tbl[] = { |
233 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_CASSINI, | 233 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_CASSINI, |
234 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, | 234 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, |
235 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SATURN, | 235 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SATURN, |
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index db8ffde491b5..8216be46540f 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c | |||
@@ -59,7 +59,7 @@ static void writeq(u64 val, void __iomem *reg) | |||
59 | } | 59 | } |
60 | #endif | 60 | #endif |
61 | 61 | ||
62 | static DEFINE_PCI_DEVICE_TABLE(niu_pci_tbl) = { | 62 | static const struct pci_device_id niu_pci_tbl[] = { |
63 | {PCI_DEVICE(PCI_VENDOR_ID_SUN, 0xabcd)}, | 63 | {PCI_DEVICE(PCI_VENDOR_ID_SUN, 0xabcd)}, |
64 | {} | 64 | {} |
65 | }; | 65 | }; |
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index 102a66fc54a2..f7415b6bf141 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c | |||
@@ -85,7 +85,7 @@ MODULE_LICENSE("GPL"); | |||
85 | 85 | ||
86 | #define GEM_MODULE_NAME "gem" | 86 | #define GEM_MODULE_NAME "gem" |
87 | 87 | ||
88 | static DEFINE_PCI_DEVICE_TABLE(gem_pci_tbl) = { | 88 | static const struct pci_device_id gem_pci_tbl[] = { |
89 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM, | 89 | { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM, |
90 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, | 90 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, |
91 | 91 | ||
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 0dbf46f08ed5..72c8525d5457 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c | |||
@@ -3172,7 +3172,7 @@ static void happy_meal_pci_remove(struct pci_dev *pdev) | |||
3172 | free_netdev(net_dev); | 3172 | free_netdev(net_dev); |
3173 | } | 3173 | } |
3174 | 3174 | ||
3175 | static DEFINE_PCI_DEVICE_TABLE(happymeal_pci_ids) = { | 3175 | static const struct pci_device_id happymeal_pci_ids[] = { |
3176 | { PCI_DEVICE(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_HAPPYMEAL) }, | 3176 | { PCI_DEVICE(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_HAPPYMEAL) }, |
3177 | { } /* Terminating entry */ | 3177 | { } /* Terminating entry */ |
3178 | }; | 3178 | }; |
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c index 38da73a2a886..6ab36d9ff2ab 100644 --- a/drivers/net/ethernet/tehuti/tehuti.c +++ b/drivers/net/ethernet/tehuti/tehuti.c | |||
@@ -66,7 +66,7 @@ | |||
66 | 66 | ||
67 | #include "tehuti.h" | 67 | #include "tehuti.h" |
68 | 68 | ||
69 | static DEFINE_PCI_DEVICE_TABLE(bdx_pci_tbl) = { | 69 | static const struct pci_device_id bdx_pci_tbl[] = { |
70 | { PCI_VDEVICE(TEHUTI, 0x3009), }, | 70 | { PCI_VDEVICE(TEHUTI, 0x3009), }, |
71 | { PCI_VDEVICE(TEHUTI, 0x3010), }, | 71 | { PCI_VDEVICE(TEHUTI, 0x3010), }, |
72 | { PCI_VDEVICE(TEHUTI, 0x3014), }, | 72 | { PCI_VDEVICE(TEHUTI, 0x3014), }, |
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c index 6078342fe3f2..f2ff0074aac9 100644 --- a/drivers/net/ethernet/ti/tlan.c +++ b/drivers/net/ethernet/ti/tlan.c | |||
@@ -116,7 +116,7 @@ static struct board { | |||
116 | TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */ | 116 | TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */ |
117 | }; | 117 | }; |
118 | 118 | ||
119 | static DEFINE_PCI_DEVICE_TABLE(tlan_pci_tbl) = { | 119 | static const struct pci_device_id tlan_pci_tbl[] = { |
120 | { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10, | 120 | { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10, |
121 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 121 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
122 | { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100, | 122 | { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100, |
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c index 0282d0161859..3e38f67c6011 100644 --- a/drivers/net/ethernet/toshiba/spider_net.c +++ b/drivers/net/ethernet/toshiba/spider_net.c | |||
@@ -73,7 +73,7 @@ MODULE_PARM_DESC(tx_descriptors, "number of descriptors used " \ | |||
73 | 73 | ||
74 | char spider_net_driver_name[] = "spidernet"; | 74 | char spider_net_driver_name[] = "spidernet"; |
75 | 75 | ||
76 | static DEFINE_PCI_DEVICE_TABLE(spider_net_pci_tbl) = { | 76 | static const struct pci_device_id spider_net_pci_tbl[] = { |
77 | { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SPIDER_NET, | 77 | { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SPIDER_NET, |
78 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, | 78 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, |
79 | { 0, } | 79 | { 0, } |
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c index fef5573dbfca..45ac38d29ed8 100644 --- a/drivers/net/ethernet/toshiba/tc35815.c +++ b/drivers/net/ethernet/toshiba/tc35815.c | |||
@@ -65,7 +65,7 @@ static const struct { | |||
65 | { "TOSHIBA TC35815/TX4939" }, | 65 | { "TOSHIBA TC35815/TX4939" }, |
66 | }; | 66 | }; |
67 | 67 | ||
68 | static DEFINE_PCI_DEVICE_TABLE(tc35815_pci_tbl) = { | 68 | static const struct pci_device_id tc35815_pci_tbl[] = { |
69 | {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815CF), .driver_data = TC35815CF }, | 69 | {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815CF), .driver_data = TC35815CF }, |
70 | {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_NWU), .driver_data = TC35815_NWU }, | 70 | {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_NWU), .driver_data = TC35815_NWU }, |
71 | {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939), .driver_data = TC35815_TX4939 }, | 71 | {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939), .driver_data = TC35815_TX4939 }, |
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 2d72f96a9e2c..68c5260cc322 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c | |||
@@ -273,7 +273,7 @@ enum rhine_quirks { | |||
273 | /* Beware of PCI posted writes */ | 273 | /* Beware of PCI posted writes */ |
274 | #define IOSYNC do { ioread8(ioaddr + StationAddr); } while (0) | 274 | #define IOSYNC do { ioread8(ioaddr + StationAddr); } while (0) |
275 | 275 | ||
276 | static DEFINE_PCI_DEVICE_TABLE(rhine_pci_tbl) = { | 276 | static const struct pci_device_id rhine_pci_tbl[] = { |
277 | { 0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, }, /* VT86C100A */ | 277 | { 0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, }, /* VT86C100A */ |
278 | { 0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, }, /* VT6102 */ | 278 | { 0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, }, /* VT6102 */ |
279 | { 0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, }, /* 6105{,L,LOM} */ | 279 | { 0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, }, /* 6105{,L,LOM} */ |
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c index de08e86db209..f5fbc12d3e10 100644 --- a/drivers/net/ethernet/via/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c | |||
@@ -381,7 +381,7 @@ static struct velocity_info_tbl chip_info_table[] = { | |||
381 | * device driver. Used for hotplug autoloading. | 381 | * device driver. Used for hotplug autoloading. |
382 | */ | 382 | */ |
383 | 383 | ||
384 | static DEFINE_PCI_DEVICE_TABLE(velocity_pci_id_table) = { | 384 | static const struct pci_device_id velocity_pci_id_table[] = { |
385 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_612X) }, | 385 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_612X) }, |
386 | { } | 386 | { } |
387 | }; | 387 | }; |
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c index 6eb849a56da5..c44eaf019dea 100644 --- a/drivers/net/fddi/defxx.c +++ b/drivers/net/fddi/defxx.c | |||
@@ -3664,7 +3664,7 @@ static int __maybe_unused dfx_dev_unregister(struct device *); | |||
3664 | static int dfx_pci_register(struct pci_dev *, const struct pci_device_id *); | 3664 | static int dfx_pci_register(struct pci_dev *, const struct pci_device_id *); |
3665 | static void dfx_pci_unregister(struct pci_dev *); | 3665 | static void dfx_pci_unregister(struct pci_dev *); |
3666 | 3666 | ||
3667 | static DEFINE_PCI_DEVICE_TABLE(dfx_pci_table) = { | 3667 | static const struct pci_device_id dfx_pci_table[] = { |
3668 | { PCI_DEVICE(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_FDDI) }, | 3668 | { PCI_DEVICE(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_FDDI) }, |
3669 | { } | 3669 | { } |
3670 | }; | 3670 | }; |
diff --git a/drivers/net/fddi/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c index d5f58121b2e2..51acc6d86e91 100644 --- a/drivers/net/fddi/skfp/skfddi.c +++ b/drivers/net/fddi/skfp/skfddi.c | |||
@@ -149,7 +149,7 @@ extern void mac_drv_rx_mode(struct s_smc *smc, int mode); | |||
149 | extern void mac_drv_clear_rx_queue(struct s_smc *smc); | 149 | extern void mac_drv_clear_rx_queue(struct s_smc *smc); |
150 | extern void enable_tx_irq(struct s_smc *smc, u_short queue); | 150 | extern void enable_tx_irq(struct s_smc *smc, u_short queue); |
151 | 151 | ||
152 | static DEFINE_PCI_DEVICE_TABLE(skfddi_pci_tbl) = { | 152 | static const struct pci_device_id skfddi_pci_tbl[] = { |
153 | { PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP, PCI_ANY_ID, PCI_ANY_ID, }, | 153 | { PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP, PCI_ANY_ID, PCI_ANY_ID, }, |
154 | { } /* Terminating entry */ | 154 | { } /* Terminating entry */ |
155 | }; | 155 | }; |
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c index e580583f196d..95c0b45a68fb 100644 --- a/drivers/net/hippi/rrunner.c +++ b/drivers/net/hippi/rrunner.c | |||
@@ -1668,7 +1668,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1668 | } | 1668 | } |
1669 | } | 1669 | } |
1670 | 1670 | ||
1671 | static DEFINE_PCI_DEVICE_TABLE(rr_pci_tbl) = { | 1671 | static const struct pci_device_id rr_pci_tbl[] = { |
1672 | { PCI_VENDOR_ID_ESSENTIAL, PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER, | 1672 | { PCI_VENDOR_ID_ESSENTIAL, PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER, |
1673 | PCI_ANY_ID, PCI_ANY_ID, }, | 1673 | PCI_ANY_ID, PCI_ANY_ID, }, |
1674 | { 0,} | 1674 | { 0,} |
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 768dfe9a9315..9fd0c20488de 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c | |||
@@ -184,7 +184,7 @@ | |||
184 | #define CONFIG0H_DMA_ON_NORX CONFIG0H_DMA_OFF| OBOE_CONFIG0H_ENDMAC | 184 | #define CONFIG0H_DMA_ON_NORX CONFIG0H_DMA_OFF| OBOE_CONFIG0H_ENDMAC |
185 | #define CONFIG0H_DMA_ON CONFIG0H_DMA_ON_NORX | OBOE_CONFIG0H_ENRX | 185 | #define CONFIG0H_DMA_ON CONFIG0H_DMA_ON_NORX | OBOE_CONFIG0H_ENRX |
186 | 186 | ||
187 | static DEFINE_PCI_DEVICE_TABLE(toshoboe_pci_tbl) = { | 187 | static const struct pci_device_id toshoboe_pci_tbl[] = { |
188 | { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701, PCI_ANY_ID, PCI_ANY_ID, }, | 188 | { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701, PCI_ANY_ID, PCI_ANY_ID, }, |
189 | { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIRD01, PCI_ANY_ID, PCI_ANY_ID, }, | 189 | { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIRD01, PCI_ANY_ID, PCI_ANY_ID, }, |
190 | { } /* Terminating entry */ | 190 | { } /* Terminating entry */ |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 998bb89ede71..36e004288ea7 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -115,7 +115,7 @@ static void iodelay(int udelay) | |||
115 | } | 115 | } |
116 | } | 116 | } |
117 | 117 | ||
118 | static DEFINE_PCI_DEVICE_TABLE(via_pci_tbl) = { | 118 | static const struct pci_device_id via_pci_tbl[] = { |
119 | { PCI_VENDOR_ID_VIA, 0x8231, PCI_ANY_ID, PCI_ANY_ID,0,0,0 }, | 119 | { PCI_VENDOR_ID_VIA, 0x8231, PCI_ANY_ID, PCI_ANY_ID,0,0,0 }, |
120 | { PCI_VENDOR_ID_VIA, 0x3109, PCI_ANY_ID, PCI_ANY_ID,0,0,1 }, | 120 | { PCI_VENDOR_ID_VIA, 0x3109, PCI_ANY_ID, PCI_ANY_ID,0,0,1 }, |
121 | { PCI_VENDOR_ID_VIA, 0x3074, PCI_ANY_ID, PCI_ANY_ID,0,0,2 }, | 121 | { PCI_VENDOR_ID_VIA, 0x3074, PCI_ANY_ID, PCI_ANY_ID,0,0,2 }, |
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 58ef59469dd0..a04af9d0f8f9 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -58,7 +58,7 @@ MODULE_LICENSE("GPL"); | |||
58 | 58 | ||
59 | static /* const */ char drivername[] = DRIVER_NAME; | 59 | static /* const */ char drivername[] = DRIVER_NAME; |
60 | 60 | ||
61 | static DEFINE_PCI_DEVICE_TABLE(vlsi_irda_table) = { | 61 | static const struct pci_device_id vlsi_irda_table[] = { |
62 | { | 62 | { |
63 | .class = PCI_CLASS_WIRELESS_IRDA << 8, | 63 | .class = PCI_CLASS_WIRELESS_IRDA << 8, |
64 | .class_mask = PCI_CLASS_SUBCLASS_MASK << 8, | 64 | .class_mask = PCI_CLASS_SUBCLASS_MASK << 8, |
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index d0db371c30a7..d6e90c72c257 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
@@ -36,7 +36,7 @@ char vmxnet3_driver_name[] = "vmxnet3"; | |||
36 | * PCI Device ID Table | 36 | * PCI Device ID Table |
37 | * Last entry must be all 0s | 37 | * Last entry must be all 0s |
38 | */ | 38 | */ |
39 | static DEFINE_PCI_DEVICE_TABLE(vmxnet3_pciid_table) = { | 39 | static const struct pci_device_id vmxnet3_pciid_table[] = { |
40 | {PCI_VDEVICE(VMWARE, PCI_DEVICE_ID_VMWARE_VMXNET3)}, | 40 | {PCI_VDEVICE(VMWARE, PCI_DEVICE_ID_VMWARE_VMXNET3)}, |
41 | {0} | 41 | {0} |
42 | }; | 42 | }; |
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 288610df205c..08223569cebd 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
@@ -2039,7 +2039,7 @@ static int __init dscc4_setup(char *str) | |||
2039 | __setup("dscc4.setup=", dscc4_setup); | 2039 | __setup("dscc4.setup=", dscc4_setup); |
2040 | #endif | 2040 | #endif |
2041 | 2041 | ||
2042 | static DEFINE_PCI_DEVICE_TABLE(dscc4_pci_tbl) = { | 2042 | static const struct pci_device_id dscc4_pci_tbl[] = { |
2043 | { PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4, | 2043 | { PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4, |
2044 | PCI_ANY_ID, PCI_ANY_ID, }, | 2044 | PCI_ANY_ID, PCI_ANY_ID, }, |
2045 | { 0,} | 2045 | { 0,} |
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 1f041271f7fe..44541dbc5c28 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
@@ -531,7 +531,7 @@ do { \ | |||
531 | /* | 531 | /* |
532 | * PCI ID lookup table | 532 | * PCI ID lookup table |
533 | */ | 533 | */ |
534 | static DEFINE_PCI_DEVICE_TABLE(fst_pci_dev_id) = { | 534 | static const struct pci_device_id fst_pci_dev_id[] = { |
535 | {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID, | 535 | {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID, |
536 | PCI_ANY_ID, 0, 0, FST_TYPE_T2P}, | 536 | PCI_ANY_ID, 0, 0, FST_TYPE_T2P}, |
537 | 537 | ||
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index b2fe9bb89633..bea0f313a7a8 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
@@ -76,7 +76,7 @@ | |||
76 | 76 | ||
77 | static int LMC_PKT_BUF_SZ = 1542; | 77 | static int LMC_PKT_BUF_SZ = 1542; |
78 | 78 | ||
79 | static DEFINE_PCI_DEVICE_TABLE(lmc_pci_tbl) = { | 79 | static const struct pci_device_id lmc_pci_tbl[] = { |
80 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, | 80 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, |
81 | PCI_VENDOR_ID_LMC, PCI_ANY_ID }, | 81 | PCI_VENDOR_ID_LMC, PCI_ANY_ID }, |
82 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, | 82 | { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, |
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c index 5b72f7f8c516..db363856e0b5 100644 --- a/drivers/net/wan/pc300too.c +++ b/drivers/net/wan/pc300too.c | |||
@@ -477,7 +477,7 @@ static int pc300_pci_init_one(struct pci_dev *pdev, | |||
477 | 477 | ||
478 | 478 | ||
479 | 479 | ||
480 | static DEFINE_PCI_DEVICE_TABLE(pc300_pci_tbl) = { | 480 | static const struct pci_device_id pc300_pci_tbl[] = { |
481 | { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_1, PCI_ANY_ID, | 481 | { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_1, PCI_ANY_ID, |
482 | PCI_ANY_ID, 0, 0, 0 }, | 482 | PCI_ANY_ID, 0, 0, 0 }, |
483 | { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_2, PCI_ANY_ID, | 483 | { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_2, PCI_ANY_ID, |
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c index fe4e3ece3c42..e8455621390e 100644 --- a/drivers/net/wan/pci200syn.c +++ b/drivers/net/wan/pci200syn.c | |||
@@ -414,7 +414,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev, | |||
414 | 414 | ||
415 | 415 | ||
416 | 416 | ||
417 | static DEFINE_PCI_DEVICE_TABLE(pci200_pci_tbl) = { | 417 | static const struct pci_device_id pci200_pci_tbl[] = { |
418 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX, | 418 | { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX, |
419 | PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 }, | 419 | PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 }, |
420 | { 0, } | 420 | { 0, } |
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index f76aa9081585..dc2fc2396465 100644 --- a/drivers/net/wan/wanxl.c +++ b/drivers/net/wan/wanxl.c | |||
@@ -807,7 +807,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev, | |||
807 | return 0; | 807 | return 0; |
808 | } | 808 | } |
809 | 809 | ||
810 | static DEFINE_PCI_DEVICE_TABLE(wanxl_pci_tbl) = { | 810 | static const struct pci_device_id wanxl_pci_tbl[] = { |
811 | { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL100, PCI_ANY_ID, | 811 | { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL100, PCI_ANY_ID, |
812 | PCI_ANY_ID, 0, 0, 0 }, | 812 | PCI_ANY_ID, 0, 0, 0 }, |
813 | { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL200, PCI_ANY_ID, | 813 | { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL200, PCI_ANY_ID, |
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index f35f93c31b09..17fcaabb2687 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
@@ -41,7 +41,7 @@ static unsigned int rx_ring_size __read_mostly = 16; | |||
41 | module_param(tx_ring_size, uint, 0); | 41 | module_param(tx_ring_size, uint, 0); |
42 | module_param(rx_ring_size, uint, 0); | 42 | module_param(rx_ring_size, uint, 0); |
43 | 43 | ||
44 | static DEFINE_PCI_DEVICE_TABLE(adm8211_pci_id_table) = { | 44 | static const struct pci_device_id adm8211_pci_id_table[] = { |
45 | /* ADMtek ADM8211 */ | 45 | /* ADMtek ADM8211 */ |
46 | { PCI_DEVICE(0x10B7, 0x6000) }, /* 3Com 3CRSHPW796 */ | 46 | { PCI_DEVICE(0x10B7, 0x6000) }, /* 3Com 3CRSHPW796 */ |
47 | { PCI_DEVICE(0x1200, 0x8201) }, /* ? */ | 47 | { PCI_DEVICE(0x1200, 0x8201) }, /* ? */ |
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index b39807579a8a..e71a2ce7a448 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -57,7 +57,7 @@ | |||
57 | #define DRV_NAME "airo" | 57 | #define DRV_NAME "airo" |
58 | 58 | ||
59 | #ifdef CONFIG_PCI | 59 | #ifdef CONFIG_PCI |
60 | static DEFINE_PCI_DEVICE_TABLE(card_ids) = { | 60 | static const struct pci_device_id card_ids[] = { |
61 | { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, }, | 61 | { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, }, |
62 | { 0x14b9, 0x4500, PCI_ANY_ID, PCI_ANY_ID }, | 62 | { 0x14b9, 0x4500, PCI_ANY_ID, PCI_ANY_ID }, |
63 | { 0x14b9, 0x4800, PCI_ANY_ID, PCI_ANY_ID, }, | 63 | { 0x14b9, 0x4800, PCI_ANY_ID, PCI_ANY_ID, }, |
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 0ffff205478d..3376963a4862 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c | |||
@@ -63,7 +63,7 @@ MODULE_PARM_DESC(reset_mode, "0: auto, 1: warm only (default: 0)"); | |||
63 | 63 | ||
64 | #define QCA988X_2_0_DEVICE_ID (0x003c) | 64 | #define QCA988X_2_0_DEVICE_ID (0x003c) |
65 | 65 | ||
66 | static DEFINE_PCI_DEVICE_TABLE(ath10k_pci_id_table) = { | 66 | static const struct pci_device_id ath10k_pci_id_table[] = { |
67 | { PCI_VDEVICE(ATHEROS, QCA988X_2_0_DEVICE_ID) }, /* PCI-E QCA988X V2 */ | 67 | { PCI_VDEVICE(ATHEROS, QCA988X_2_0_DEVICE_ID) }, /* PCI-E QCA988X V2 */ |
68 | {0} | 68 | {0} |
69 | }; | 69 | }; |
diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c index f77ef36acf87..48a6a69b57bc 100644 --- a/drivers/net/wireless/ath/ath5k/led.c +++ b/drivers/net/wireless/ath/ath5k/led.c | |||
@@ -53,7 +53,7 @@ | |||
53 | #define ATH_POLARITY(data) ((data) & 0xff) | 53 | #define ATH_POLARITY(data) ((data) & 0xff) |
54 | 54 | ||
55 | /* Devices we match on for LED config info (typically laptops) */ | 55 | /* Devices we match on for LED config info (typically laptops) */ |
56 | static DEFINE_PCI_DEVICE_TABLE(ath5k_led_devices) = { | 56 | static const struct pci_device_id ath5k_led_devices[] = { |
57 | /* AR5211 */ | 57 | /* AR5211 */ |
58 | { PCI_VDEVICE(ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5211), ATH_LED(0, 0) }, | 58 | { PCI_VDEVICE(ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5211), ATH_LED(0, 0) }, |
59 | /* HP Compaq nc6xx, nc4000, nx6000 */ | 59 | /* HP Compaq nc6xx, nc4000, nx6000 */ |
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c index 859db7c34f87..c6156cc38940 100644 --- a/drivers/net/wireless/ath/ath5k/pci.c +++ b/drivers/net/wireless/ath/ath5k/pci.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "reg.h" | 28 | #include "reg.h" |
29 | 29 | ||
30 | /* Known PCI ids */ | 30 | /* Known PCI ids */ |
31 | static DEFINE_PCI_DEVICE_TABLE(ath5k_pci_id_table) = { | 31 | static const struct pci_device_id ath5k_pci_id_table[] = { |
32 | { PCI_VDEVICE(ATHEROS, 0x0207) }, /* 5210 early */ | 32 | { PCI_VDEVICE(ATHEROS, 0x0207) }, /* 5210 early */ |
33 | { PCI_VDEVICE(ATHEROS, 0x0007) }, /* 5210 */ | 33 | { PCI_VDEVICE(ATHEROS, 0x0007) }, /* 5210 */ |
34 | { PCI_VDEVICE(ATHEROS, 0x0011) }, /* 5311 - this is on AHB bus !*/ | 34 | { PCI_VDEVICE(ATHEROS, 0x0011) }, /* 5311 - this is on AHB bus !*/ |
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 7a2b2c5caced..c018dea0b2e8 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include "ath9k.h" | 24 | #include "ath9k.h" |
25 | 25 | ||
26 | static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { | 26 | static const struct pci_device_id ath_pci_id_table[] = { |
27 | { PCI_VDEVICE(ATHEROS, 0x0023) }, /* PCI */ | 27 | { PCI_VDEVICE(ATHEROS, 0x0023) }, /* PCI */ |
28 | { PCI_VDEVICE(ATHEROS, 0x0024) }, /* PCI-E */ | 28 | { PCI_VDEVICE(ATHEROS, 0x0024) }, /* PCI-E */ |
29 | { PCI_VDEVICE(ATHEROS, 0x0027) }, /* PCI */ | 29 | { PCI_VDEVICE(ATHEROS, 0x0027) }, /* PCI */ |
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c index 5cd97e3cbee3..bcf1f274a251 100644 --- a/drivers/net/wireless/atmel_pci.c +++ b/drivers/net/wireless/atmel_pci.c | |||
@@ -30,7 +30,7 @@ MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.") | |||
30 | MODULE_LICENSE("GPL"); | 30 | MODULE_LICENSE("GPL"); |
31 | MODULE_SUPPORTED_DEVICE("Atmel at76c506 PCI wireless cards"); | 31 | MODULE_SUPPORTED_DEVICE("Atmel at76c506 PCI wireless cards"); |
32 | 32 | ||
33 | static DEFINE_PCI_DEVICE_TABLE(card_ids) = { | 33 | static const struct pci_device_id card_ids[] = { |
34 | { 0x1114, 0x0506, PCI_ANY_ID, PCI_ANY_ID }, | 34 | { 0x1114, 0x0506, PCI_ANY_ID, PCI_ANY_ID }, |
35 | { 0, } | 35 | { 0, } |
36 | }; | 36 | }; |
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index 91158e2e961c..c864ef4b0015 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c | |||
@@ -39,7 +39,7 @@ struct hostap_pci_priv { | |||
39 | /* FIX: do we need mb/wmb/rmb with memory operations? */ | 39 | /* FIX: do we need mb/wmb/rmb with memory operations? */ |
40 | 40 | ||
41 | 41 | ||
42 | static DEFINE_PCI_DEVICE_TABLE(prism2_pci_id_table) = { | 42 | static const struct pci_device_id prism2_pci_id_table[] = { |
43 | /* Intersil Prism3 ISL3872 11Mb/s WLAN Controller */ | 43 | /* Intersil Prism3 ISL3872 11Mb/s WLAN Controller */ |
44 | { 0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID }, | 44 | { 0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID }, |
45 | /* Intersil Prism2.5 ISL3874 11Mb/s WLAN Controller */ | 45 | /* Intersil Prism2.5 ISL3874 11Mb/s WLAN Controller */ |
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c index 3bf530d9a40f..4901a99c6c59 100644 --- a/drivers/net/wireless/hostap/hostap_plx.c +++ b/drivers/net/wireless/hostap/hostap_plx.c | |||
@@ -60,7 +60,7 @@ struct hostap_plx_priv { | |||
60 | 60 | ||
61 | #define PLXDEV(vendor,dev,str) { vendor, dev, PCI_ANY_ID, PCI_ANY_ID } | 61 | #define PLXDEV(vendor,dev,str) { vendor, dev, PCI_ANY_ID, PCI_ANY_ID } |
62 | 62 | ||
63 | static DEFINE_PCI_DEVICE_TABLE(prism2_plx_id_table) = { | 63 | static const struct pci_device_id prism2_plx_id_table[] = { |
64 | PLXDEV(0x10b7, 0x7770, "3Com AirConnect PCI 777A"), | 64 | PLXDEV(0x10b7, 0x7770, "3Com AirConnect PCI 777A"), |
65 | PLXDEV(0x111a, 0x1023, "Siemens SpeedStream SS1023"), | 65 | PLXDEV(0x111a, 0x1023, "Siemens SpeedStream SS1023"), |
66 | PLXDEV(0x126c, 0x8030, "Nortel emobility"), | 66 | PLXDEV(0x126c, 0x8030, "Nortel emobility"), |
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 1ab8e500fb77..c3d726f334e3 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -6505,7 +6505,7 @@ static void ipw2100_shutdown(struct pci_dev *pci_dev) | |||
6505 | 6505 | ||
6506 | #define IPW2100_DEV_ID(x) { PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, x } | 6506 | #define IPW2100_DEV_ID(x) { PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, x } |
6507 | 6507 | ||
6508 | static DEFINE_PCI_DEVICE_TABLE(ipw2100_pci_id_table) = { | 6508 | static const struct pci_device_id ipw2100_pci_id_table[] = { |
6509 | IPW2100_DEV_ID(0x2520), /* IN 2100A mPCI 3A */ | 6509 | IPW2100_DEV_ID(0x2520), /* IN 2100A mPCI 3A */ |
6510 | IPW2100_DEV_ID(0x2521), /* IN 2100A mPCI 3B */ | 6510 | IPW2100_DEV_ID(0x2521), /* IN 2100A mPCI 3B */ |
6511 | IPW2100_DEV_ID(0x2524), /* IN 2100A mPCI 3B */ | 6511 | IPW2100_DEV_ID(0x2524), /* IN 2100A mPCI 3B */ |
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index c5aa404069f3..800b62bb41e8 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
@@ -11542,7 +11542,7 @@ out: | |||
11542 | } | 11542 | } |
11543 | 11543 | ||
11544 | /* PCI driver stuff */ | 11544 | /* PCI driver stuff */ |
11545 | static DEFINE_PCI_DEVICE_TABLE(card_ids) = { | 11545 | static const struct pci_device_id card_ids[] = { |
11546 | {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2701, 0, 0, 0}, | 11546 | {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2701, 0, 0, 0}, |
11547 | {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2702, 0, 0, 0}, | 11547 | {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2702, 0, 0, 0}, |
11548 | {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2711, 0, 0, 0}, | 11548 | {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2711, 0, 0, 0}, |
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c index b598e2803500..93bdf684babe 100644 --- a/drivers/net/wireless/iwlegacy/3945.c +++ b/drivers/net/wireless/iwlegacy/3945.c | |||
@@ -2728,7 +2728,7 @@ static struct il_cfg il3945_abg_cfg = { | |||
2728 | }, | 2728 | }, |
2729 | }; | 2729 | }; |
2730 | 2730 | ||
2731 | DEFINE_PCI_DEVICE_TABLE(il3945_hw_card_ids) = { | 2731 | const struct pci_device_id il3945_hw_card_ids[] = { |
2732 | {IL_PCI_DEVICE(0x4222, 0x1005, il3945_bg_cfg)}, | 2732 | {IL_PCI_DEVICE(0x4222, 0x1005, il3945_bg_cfg)}, |
2733 | {IL_PCI_DEVICE(0x4222, 0x1034, il3945_bg_cfg)}, | 2733 | {IL_PCI_DEVICE(0x4222, 0x1034, il3945_bg_cfg)}, |
2734 | {IL_PCI_DEVICE(0x4222, 0x1044, il3945_bg_cfg)}, | 2734 | {IL_PCI_DEVICE(0x4222, 0x1044, il3945_bg_cfg)}, |
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index c159c05db6ef..3dcbe2cd2b28 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
@@ -6800,7 +6800,7 @@ il4965_txq_set_sched(struct il_priv *il, u32 mask) | |||
6800 | *****************************************************************************/ | 6800 | *****************************************************************************/ |
6801 | 6801 | ||
6802 | /* Hardware specific file defines the PCI IDs table for that hardware module */ | 6802 | /* Hardware specific file defines the PCI IDs table for that hardware module */ |
6803 | static DEFINE_PCI_DEVICE_TABLE(il4965_hw_card_ids) = { | 6803 | static const struct pci_device_id il4965_hw_card_ids[] = { |
6804 | {IL_PCI_DEVICE(0x4229, PCI_ANY_ID, il4965_cfg)}, | 6804 | {IL_PCI_DEVICE(0x4229, PCI_ANY_ID, il4965_cfg)}, |
6805 | {IL_PCI_DEVICE(0x4230, PCI_ANY_ID, il4965_cfg)}, | 6805 | {IL_PCI_DEVICE(0x4230, PCI_ANY_ID, il4965_cfg)}, |
6806 | {0} | 6806 | {0} |
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index 98950e45c7b0..f0e722ced080 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c | |||
@@ -78,7 +78,7 @@ | |||
78 | .driver_data = (kernel_ulong_t)&(cfg) | 78 | .driver_data = (kernel_ulong_t)&(cfg) |
79 | 79 | ||
80 | /* Hardware specific file defines the PCI IDs table for that hardware module */ | 80 | /* Hardware specific file defines the PCI IDs table for that hardware module */ |
81 | static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { | 81 | static const struct pci_device_id iwl_hw_card_ids[] = { |
82 | #if IS_ENABLED(CONFIG_IWLDVM) | 82 | #if IS_ENABLED(CONFIG_IWLDVM) |
83 | {IWL_PCI_DEVICE(0x4232, 0x1201, iwl5100_agn_cfg)}, /* Mini Card */ | 83 | {IWL_PCI_DEVICE(0x4232, 0x1201, iwl5100_agn_cfg)}, /* Mini Card */ |
84 | {IWL_PCI_DEVICE(0x4232, 0x1301, iwl5100_agn_cfg)}, /* Half Mini Card */ | 84 | {IWL_PCI_DEVICE(0x4232, 0x1301, iwl5100_agn_cfg)}, /* Half Mini Card */ |
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index c16dd2cc8198..ff0545888dd0 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c | |||
@@ -257,7 +257,7 @@ static void mwifiex_pcie_shutdown(struct pci_dev *pdev) | |||
257 | return; | 257 | return; |
258 | } | 258 | } |
259 | 259 | ||
260 | static DEFINE_PCI_DEVICE_TABLE(mwifiex_ids) = { | 260 | static const struct pci_device_id mwifiex_ids[] = { |
261 | { | 261 | { |
262 | PCIE_VENDOR_ID_MARVELL, PCIE_DEVICE_ID_MARVELL_88W8766P, | 262 | PCIE_VENDOR_ID_MARVELL, PCIE_DEVICE_ID_MARVELL_88W8766P, |
263 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 263 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, |
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index fc6cb215e761..ef1104476bd8 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -5674,7 +5674,7 @@ MODULE_FIRMWARE("mwl8k/helper_8366.fw"); | |||
5674 | MODULE_FIRMWARE("mwl8k/fmimage_8366.fw"); | 5674 | MODULE_FIRMWARE("mwl8k/fmimage_8366.fw"); |
5675 | MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API)); | 5675 | MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API)); |
5676 | 5676 | ||
5677 | static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = { | 5677 | static const struct pci_device_id mwl8k_pci_id_table[] = { |
5678 | { PCI_VDEVICE(MARVELL, 0x2a0a), .driver_data = MWL8363, }, | 5678 | { PCI_VDEVICE(MARVELL, 0x2a0a), .driver_data = MWL8363, }, |
5679 | { PCI_VDEVICE(MARVELL, 0x2a0c), .driver_data = MWL8363, }, | 5679 | { PCI_VDEVICE(MARVELL, 0x2a0c), .driver_data = MWL8363, }, |
5680 | { PCI_VDEVICE(MARVELL, 0x2a24), .driver_data = MWL8363, }, | 5680 | { PCI_VDEVICE(MARVELL, 0x2a24), .driver_data = MWL8363, }, |
diff --git a/drivers/net/wireless/orinoco/orinoco_nortel.c b/drivers/net/wireless/orinoco/orinoco_nortel.c index ffb2469eb679..1b543e30eff7 100644 --- a/drivers/net/wireless/orinoco/orinoco_nortel.c +++ b/drivers/net/wireless/orinoco/orinoco_nortel.c | |||
@@ -272,7 +272,7 @@ static void orinoco_nortel_remove_one(struct pci_dev *pdev) | |||
272 | pci_disable_device(pdev); | 272 | pci_disable_device(pdev); |
273 | } | 273 | } |
274 | 274 | ||
275 | static DEFINE_PCI_DEVICE_TABLE(orinoco_nortel_id_table) = { | 275 | static const struct pci_device_id orinoco_nortel_id_table[] = { |
276 | /* Nortel emobility PCI */ | 276 | /* Nortel emobility PCI */ |
277 | {0x126c, 0x8030, PCI_ANY_ID, PCI_ANY_ID,}, | 277 | {0x126c, 0x8030, PCI_ANY_ID, PCI_ANY_ID,}, |
278 | /* Symbol LA-4123 PCI */ | 278 | /* Symbol LA-4123 PCI */ |
diff --git a/drivers/net/wireless/orinoco/orinoco_pci.c b/drivers/net/wireless/orinoco/orinoco_pci.c index 5ae1191d2532..b6bdad632842 100644 --- a/drivers/net/wireless/orinoco/orinoco_pci.c +++ b/drivers/net/wireless/orinoco/orinoco_pci.c | |||
@@ -210,7 +210,7 @@ static void orinoco_pci_remove_one(struct pci_dev *pdev) | |||
210 | pci_disable_device(pdev); | 210 | pci_disable_device(pdev); |
211 | } | 211 | } |
212 | 212 | ||
213 | static DEFINE_PCI_DEVICE_TABLE(orinoco_pci_id_table) = { | 213 | static const struct pci_device_id orinoco_pci_id_table[] = { |
214 | /* Intersil Prism 3 */ | 214 | /* Intersil Prism 3 */ |
215 | {0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID,}, | 215 | {0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID,}, |
216 | /* Intersil Prism 2.5 */ | 216 | /* Intersil Prism 2.5 */ |
diff --git a/drivers/net/wireless/orinoco/orinoco_plx.c b/drivers/net/wireless/orinoco/orinoco_plx.c index bbd36d1676ff..b8f6e5c431ae 100644 --- a/drivers/net/wireless/orinoco/orinoco_plx.c +++ b/drivers/net/wireless/orinoco/orinoco_plx.c | |||
@@ -308,7 +308,7 @@ static void orinoco_plx_remove_one(struct pci_dev *pdev) | |||
308 | pci_disable_device(pdev); | 308 | pci_disable_device(pdev); |
309 | } | 309 | } |
310 | 310 | ||
311 | static DEFINE_PCI_DEVICE_TABLE(orinoco_plx_id_table) = { | 311 | static const struct pci_device_id orinoco_plx_id_table[] = { |
312 | {0x111a, 0x1023, PCI_ANY_ID, PCI_ANY_ID,}, /* Siemens SpeedStream SS1023 */ | 312 | {0x111a, 0x1023, PCI_ANY_ID, PCI_ANY_ID,}, /* Siemens SpeedStream SS1023 */ |
313 | {0x1385, 0x4100, PCI_ANY_ID, PCI_ANY_ID,}, /* Netgear MA301 */ | 313 | {0x1385, 0x4100, PCI_ANY_ID, PCI_ANY_ID,}, /* Netgear MA301 */ |
314 | {0x15e8, 0x0130, PCI_ANY_ID, PCI_ANY_ID,}, /* Correga - does this work? */ | 314 | {0x15e8, 0x0130, PCI_ANY_ID, PCI_ANY_ID,}, /* Correga - does this work? */ |
diff --git a/drivers/net/wireless/orinoco/orinoco_tmd.c b/drivers/net/wireless/orinoco/orinoco_tmd.c index 04b08de5fd5d..79d0e33b625e 100644 --- a/drivers/net/wireless/orinoco/orinoco_tmd.c +++ b/drivers/net/wireless/orinoco/orinoco_tmd.c | |||
@@ -201,7 +201,7 @@ static void orinoco_tmd_remove_one(struct pci_dev *pdev) | |||
201 | pci_disable_device(pdev); | 201 | pci_disable_device(pdev); |
202 | } | 202 | } |
203 | 203 | ||
204 | static DEFINE_PCI_DEVICE_TABLE(orinoco_tmd_id_table) = { | 204 | static const struct pci_device_id orinoco_tmd_id_table[] = { |
205 | {0x15e8, 0x0131, PCI_ANY_ID, PCI_ANY_ID,}, /* NDC and OEMs, e.g. pheecom */ | 205 | {0x15e8, 0x0131, PCI_ANY_ID, PCI_ANY_ID,}, /* NDC and OEMs, e.g. pheecom */ |
206 | {0,}, | 206 | {0,}, |
207 | }; | 207 | }; |
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index d411de409050..d4aee64fb5ea 100644 --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c | |||
@@ -32,7 +32,7 @@ MODULE_LICENSE("GPL"); | |||
32 | MODULE_ALIAS("prism54pci"); | 32 | MODULE_ALIAS("prism54pci"); |
33 | MODULE_FIRMWARE("isl3886pci"); | 33 | MODULE_FIRMWARE("isl3886pci"); |
34 | 34 | ||
35 | static DEFINE_PCI_DEVICE_TABLE(p54p_table) = { | 35 | static const struct pci_device_id p54p_table[] = { |
36 | /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ | 36 | /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ |
37 | { PCI_DEVICE(0x1260, 0x3890) }, | 37 | { PCI_DEVICE(0x1260, 0x3890) }, |
38 | /* 3COM 3CRWE154G72 Wireless LAN adapter */ | 38 | /* 3COM 3CRWE154G72 Wireless LAN adapter */ |
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c index 1105a12dbde8..300c846ea087 100644 --- a/drivers/net/wireless/prism54/islpci_hotplug.c +++ b/drivers/net/wireless/prism54/islpci_hotplug.c | |||
@@ -39,7 +39,7 @@ module_param(init_pcitm, int, 0); | |||
39 | * driver_data | 39 | * driver_data |
40 | * If you have an update for this please contact prism54-devel@prism54.org | 40 | * If you have an update for this please contact prism54-devel@prism54.org |
41 | * The latest list can be found at http://wireless.kernel.org/en/users/Drivers/p54 */ | 41 | * The latest list can be found at http://wireless.kernel.org/en/users/Drivers/p54 */ |
42 | static DEFINE_PCI_DEVICE_TABLE(prism54_id_tbl) = { | 42 | static const struct pci_device_id prism54_id_tbl[] = { |
43 | /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ | 43 | /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ |
44 | { | 44 | { |
45 | 0x1260, 0x3890, | 45 | 0x1260, 0x3890, |
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index 4ccfef5094e0..bdf5590ba304 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
@@ -1821,7 +1821,7 @@ static const struct rt2x00_ops rt2400pci_ops = { | |||
1821 | /* | 1821 | /* |
1822 | * RT2400pci module information. | 1822 | * RT2400pci module information. |
1823 | */ | 1823 | */ |
1824 | static DEFINE_PCI_DEVICE_TABLE(rt2400pci_device_table) = { | 1824 | static const struct pci_device_id rt2400pci_device_table[] = { |
1825 | { PCI_DEVICE(0x1814, 0x0101) }, | 1825 | { PCI_DEVICE(0x1814, 0x0101) }, |
1826 | { 0, } | 1826 | { 0, } |
1827 | }; | 1827 | }; |
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index a511cccc9f01..79f4fe65a119 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c | |||
@@ -2120,7 +2120,7 @@ static const struct rt2x00_ops rt2500pci_ops = { | |||
2120 | /* | 2120 | /* |
2121 | * RT2500pci module information. | 2121 | * RT2500pci module information. |
2122 | */ | 2122 | */ |
2123 | static DEFINE_PCI_DEVICE_TABLE(rt2500pci_device_table) = { | 2123 | static const struct pci_device_id rt2500pci_device_table[] = { |
2124 | { PCI_DEVICE(0x1814, 0x0201) }, | 2124 | { PCI_DEVICE(0x1814, 0x0201) }, |
2125 | { 0, } | 2125 | { 0, } |
2126 | }; | 2126 | }; |
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index a5b32ca2cf0f..cc1b3cc73c5a 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c | |||
@@ -400,7 +400,7 @@ static const struct rt2x00_ops rt2800pci_ops = { | |||
400 | /* | 400 | /* |
401 | * RT2800pci module information. | 401 | * RT2800pci module information. |
402 | */ | 402 | */ |
403 | static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = { | 403 | static const struct pci_device_id rt2800pci_device_table[] = { |
404 | { PCI_DEVICE(0x1814, 0x0601) }, | 404 | { PCI_DEVICE(0x1814, 0x0601) }, |
405 | { PCI_DEVICE(0x1814, 0x0681) }, | 405 | { PCI_DEVICE(0x1814, 0x0681) }, |
406 | { PCI_DEVICE(0x1814, 0x0701) }, | 406 | { PCI_DEVICE(0x1814, 0x0701) }, |
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 9048a9cbe52c..819455009fe4 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -3075,7 +3075,7 @@ static const struct rt2x00_ops rt61pci_ops = { | |||
3075 | /* | 3075 | /* |
3076 | * RT61pci module information. | 3076 | * RT61pci module information. |
3077 | */ | 3077 | */ |
3078 | static DEFINE_PCI_DEVICE_TABLE(rt61pci_device_table) = { | 3078 | static const struct pci_device_id rt61pci_device_table[] = { |
3079 | /* RT2561s */ | 3079 | /* RT2561s */ |
3080 | { PCI_DEVICE(0x1814, 0x0301) }, | 3080 | { PCI_DEVICE(0x1814, 0x0301) }, |
3081 | /* RT2561 v2 */ | 3081 | /* RT2561 v2 */ |
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index fcc45e5bf50a..026d912f516b 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c | |||
@@ -64,7 +64,7 @@ MODULE_AUTHOR("Andrea Merello <andrea.merello@gmail.com>"); | |||
64 | MODULE_DESCRIPTION("RTL8180 / RTL8185 / RTL8187SE PCI wireless driver"); | 64 | MODULE_DESCRIPTION("RTL8180 / RTL8185 / RTL8187SE PCI wireless driver"); |
65 | MODULE_LICENSE("GPL"); | 65 | MODULE_LICENSE("GPL"); |
66 | 66 | ||
67 | static DEFINE_PCI_DEVICE_TABLE(rtl8180_table) = { | 67 | static const struct pci_device_id rtl8180_table[] = { |
68 | 68 | ||
69 | /* rtl8187se */ | 69 | /* rtl8187se */ |
70 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8199) }, | 70 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8199) }, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c index 842d69349a37..631b6907c17d 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | |||
@@ -364,7 +364,7 @@ static struct rtl_hal_cfg rtl88ee_hal_cfg = { | |||
364 | .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15, | 364 | .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15, |
365 | }; | 365 | }; |
366 | 366 | ||
367 | static DEFINE_PCI_DEVICE_TABLE(rtl88ee_pci_ids) = { | 367 | static const struct pci_device_id rtl88ee_pci_ids[] = { |
368 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8179, rtl88ee_hal_cfg)}, | 368 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8179, rtl88ee_hal_cfg)}, |
369 | {}, | 369 | {}, |
370 | }; | 370 | }; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c index 12f21f4073e8..4bbdfb2df363 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | |||
@@ -344,7 +344,7 @@ static struct rtl_hal_cfg rtl92ce_hal_cfg = { | |||
344 | .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15, | 344 | .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15, |
345 | }; | 345 | }; |
346 | 346 | ||
347 | static DEFINE_PCI_DEVICE_TABLE(rtl92ce_pci_ids) = { | 347 | static const struct pci_device_id rtl92ce_pci_ids[] = { |
348 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8191, rtl92ce_hal_cfg)}, | 348 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8191, rtl92ce_hal_cfg)}, |
349 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8178, rtl92ce_hal_cfg)}, | 349 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8178, rtl92ce_hal_cfg)}, |
350 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8177, rtl92ce_hal_cfg)}, | 350 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8177, rtl92ce_hal_cfg)}, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/rtlwifi/rtl8723be/sw.c index ff12bf41644b..532913c6622a 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723be/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723be/sw.c | |||
@@ -348,7 +348,7 @@ static struct rtl_hal_cfg rtl8723be_hal_cfg = { | |||
348 | .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15, | 348 | .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15, |
349 | }; | 349 | }; |
350 | 350 | ||
351 | static DEFINE_PCI_DEVICE_TABLE(rtl8723be_pci_id) = { | 351 | static const struct pci_device_id rtl8723be_pci_id[] = { |
352 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xb723, rtl8723be_hal_cfg)}, | 352 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xb723, rtl8723be_hal_cfg)}, |
353 | {}, | 353 | {}, |
354 | }; | 354 | }; |
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c index 6b2b7dddbbdb..f6219d36227f 100644 --- a/drivers/pci/ioapic.c +++ b/drivers/pci/ioapic.c | |||
@@ -98,7 +98,7 @@ static void ioapic_remove(struct pci_dev *dev) | |||
98 | } | 98 | } |
99 | 99 | ||
100 | 100 | ||
101 | static DEFINE_PCI_DEVICE_TABLE(ioapic_devices) = { | 101 | static const struct pci_device_id ioapic_devices[] = { |
102 | { PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOAPIC, ~0) }, | 102 | { PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOAPIC, ~0) }, |
103 | { PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOXAPIC, ~0) }, | 103 | { PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOXAPIC, ~0) }, |
104 | { } | 104 | { } |
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index 18dcb58ba965..a0d1f576cf40 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c | |||
@@ -1478,7 +1478,7 @@ ips_link_to_i915_driver(void) | |||
1478 | } | 1478 | } |
1479 | EXPORT_SYMBOL_GPL(ips_link_to_i915_driver); | 1479 | EXPORT_SYMBOL_GPL(ips_link_to_i915_driver); |
1480 | 1480 | ||
1481 | static DEFINE_PCI_DEVICE_TABLE(ips_id_table) = { | 1481 | static const struct pci_device_id ips_id_table[] = { |
1482 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, | 1482 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, |
1483 | PCI_DEVICE_ID_INTEL_THERMAL_SENSOR), }, | 1483 | PCI_DEVICE_ID_INTEL_THERMAL_SENSOR), }, |
1484 | { 0, } | 1484 | { 0, } |
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c index 76ca094ed012..66a4d3284aab 100644 --- a/drivers/platform/x86/intel_scu_ipc.c +++ b/drivers/platform/x86/intel_scu_ipc.c | |||
@@ -640,7 +640,7 @@ static void ipc_remove(struct pci_dev *pdev) | |||
640 | intel_scu_devices_destroy(); | 640 | intel_scu_devices_destroy(); |
641 | } | 641 | } |
642 | 642 | ||
643 | static DEFINE_PCI_DEVICE_TABLE(pci_ids) = { | 643 | static const struct pci_device_id pci_ids[] = { |
644 | { | 644 | { |
645 | PCI_VDEVICE(INTEL, PCI_DEVICE_ID_LINCROFT), | 645 | PCI_VDEVICE(INTEL, PCI_DEVICE_ID_LINCROFT), |
646 | (kernel_ulong_t)&intel_scu_ipc_lincroft_pdata, | 646 | (kernel_ulong_t)&intel_scu_ipc_lincroft_pdata, |
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c index 90a106308c4f..255487272859 100644 --- a/drivers/ptp/ptp_pch.c +++ b/drivers/ptp/ptp_pch.c | |||
@@ -691,7 +691,7 @@ err_pci_en: | |||
691 | return ret; | 691 | return ret; |
692 | } | 692 | } |
693 | 693 | ||
694 | static DEFINE_PCI_DEVICE_TABLE(pch_ieee1588_pcidev_id) = { | 694 | static const struct pci_device_id pch_ieee1588_pcidev_id[] = { |
695 | { | 695 | { |
696 | .vendor = PCI_VENDOR_ID_INTEL, | 696 | .vendor = PCI_VENDOR_ID_INTEL, |
697 | .device = PCI_DEVICE_ID_PCH_1588 | 697 | .device = PCI_DEVICE_ID_PCH_1588 |
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c index 2ca1a0b3ad57..8bcfecd66281 100644 --- a/drivers/rapidio/devices/tsi721.c +++ b/drivers/rapidio/devices/tsi721.c | |||
@@ -2493,7 +2493,7 @@ err_exit: | |||
2493 | return err; | 2493 | return err; |
2494 | } | 2494 | } |
2495 | 2495 | ||
2496 | static DEFINE_PCI_DEVICE_TABLE(tsi721_pci_tbl) = { | 2496 | static const struct pci_device_id tsi721_pci_tbl[] = { |
2497 | { PCI_DEVICE(PCI_VENDOR_ID_IDT, PCI_DEVICE_ID_TSI721) }, | 2497 | { PCI_DEVICE(PCI_VENDOR_ID_IDT, PCI_DEVICE_ID_TSI721) }, |
2498 | { 0, } /* terminate list */ | 2498 | { 0, } /* terminate list */ |
2499 | }; | 2499 | }; |
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index 972f8176665f..64c75143c89a 100644 --- a/drivers/scsi/BusLogic.c +++ b/drivers/scsi/BusLogic.c | |||
@@ -3893,7 +3893,7 @@ __setup("BusLogic=", blogic_setup); | |||
3893 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 3893 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
3894 | { } | 3894 | { } |
3895 | };*/ | 3895 | };*/ |
3896 | static DEFINE_PCI_DEVICE_TABLE(blogic_pci_tbl) = { | 3896 | static const struct pci_device_id blogic_pci_tbl[] = { |
3897 | {PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER)}, | 3897 | {PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER)}, |
3898 | {PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC)}, | 3898 | {PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC)}, |
3899 | {PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT)}, | 3899 | {PCI_DEVICE(PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT)}, |
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index eb3e3e619155..915c26b23ab6 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c | |||
@@ -539,7 +539,7 @@ static umode_t beiscsi_eth_get_attr_visibility(void *data, int type) | |||
539 | } | 539 | } |
540 | 540 | ||
541 | /*------------------- PCI Driver operations and data ----------------- */ | 541 | /*------------------- PCI Driver operations and data ----------------- */ |
542 | static DEFINE_PCI_DEVICE_TABLE(beiscsi_pci_id_table) = { | 542 | static const struct pci_device_id beiscsi_pci_id_table[] = { |
543 | { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) }, | 543 | { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) }, |
544 | { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, | 544 | { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, |
545 | { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) }, | 545 | { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) }, |
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c index 1aafc331ee63..17794add855c 100644 --- a/drivers/scsi/csiostor/csio_init.c +++ b/drivers/scsi/csiostor/csio_init.c | |||
@@ -1167,7 +1167,7 @@ static struct pci_error_handlers csio_err_handler = { | |||
1167 | .resume = csio_pci_resume, | 1167 | .resume = csio_pci_resume, |
1168 | }; | 1168 | }; |
1169 | 1169 | ||
1170 | static DEFINE_PCI_DEVICE_TABLE(csio_pci_tbl) = { | 1170 | static const struct pci_device_id csio_pci_tbl[] = { |
1171 | CSIO_DEVICE(CSIO_DEVID_T440DBG_FCOE, 0), /* T4 DEBUG FCOE */ | 1171 | CSIO_DEVICE(CSIO_DEVID_T440DBG_FCOE, 0), /* T4 DEBUG FCOE */ |
1172 | CSIO_DEVICE(CSIO_DEVID_T420CR_FCOE, 0), /* T420CR FCOE */ | 1172 | CSIO_DEVICE(CSIO_DEVID_T420CR_FCOE, 0), /* T420CR FCOE */ |
1173 | CSIO_DEVICE(CSIO_DEVID_T422CR_FCOE, 0), /* T422CR FCOE */ | 1173 | CSIO_DEVICE(CSIO_DEVID_T422CR_FCOE, 0), /* T422CR FCOE */ |
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 4198e45ea941..2e890b1e2526 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c | |||
@@ -75,7 +75,7 @@ MODULE_VERSION(DRV_VERSION); | |||
75 | 75 | ||
76 | static struct scsi_transport_template *isci_transport_template; | 76 | static struct scsi_transport_template *isci_transport_template; |
77 | 77 | ||
78 | static DEFINE_PCI_DEVICE_TABLE(isci_id_table) = { | 78 | static const struct pci_device_id isci_id_table[] = { |
79 | { PCI_VDEVICE(INTEL, 0x1D61),}, | 79 | { PCI_VDEVICE(INTEL, 0x1D61),}, |
80 | { PCI_VDEVICE(INTEL, 0x1D63),}, | 80 | { PCI_VDEVICE(INTEL, 0x1D63),}, |
81 | { PCI_VDEVICE(INTEL, 0x1D65),}, | 81 | { PCI_VDEVICE(INTEL, 0x1D65),}, |
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 7cf48c5c15a7..135f12c20ecf 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c | |||
@@ -247,7 +247,7 @@ struct _scsi_io_transfer { | |||
247 | /* | 247 | /* |
248 | * The pci device ids are defined in mpi/mpi2_cnfg.h. | 248 | * The pci device ids are defined in mpi/mpi2_cnfg.h. |
249 | */ | 249 | */ |
250 | static DEFINE_PCI_DEVICE_TABLE(scsih_pci_table) = { | 250 | static const struct pci_device_id scsih_pci_table[] = { |
251 | /* Fury ~ 3004 and 3008 */ | 251 | /* Fury ~ 3004 and 3008 */ |
252 | { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, | 252 | { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, |
253 | PCI_ANY_ID, PCI_ANY_ID }, | 253 | PCI_ANY_ID, PCI_ANY_ID }, |
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c index 3e716b2f611a..3e6b866759fe 100644 --- a/drivers/scsi/mvumi.c +++ b/drivers/scsi/mvumi.c | |||
@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL"); | |||
48 | MODULE_AUTHOR("jyli@marvell.com"); | 48 | MODULE_AUTHOR("jyli@marvell.com"); |
49 | MODULE_DESCRIPTION("Marvell UMI Driver"); | 49 | MODULE_DESCRIPTION("Marvell UMI Driver"); |
50 | 50 | ||
51 | static DEFINE_PCI_DEVICE_TABLE(mvumi_pci_table) = { | 51 | static const struct pci_device_id mvumi_pci_table[] = { |
52 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, PCI_DEVICE_ID_MARVELL_MV9143) }, | 52 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, PCI_DEVICE_ID_MARVELL_MV9143) }, |
53 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, PCI_DEVICE_ID_MARVELL_MV9580) }, | 53 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, PCI_DEVICE_ID_MARVELL_MV9580) }, |
54 | { 0 } | 54 | { 0 } |
diff --git a/drivers/scsi/ufs/ufshcd-pci.c b/drivers/scsi/ufs/ufshcd-pci.c index c007a7a69c28..afaabe2aeac8 100644 --- a/drivers/scsi/ufs/ufshcd-pci.c +++ b/drivers/scsi/ufs/ufshcd-pci.c | |||
@@ -185,7 +185,7 @@ static const struct dev_pm_ops ufshcd_pci_pm_ops = { | |||
185 | .runtime_idle = ufshcd_pci_runtime_idle, | 185 | .runtime_idle = ufshcd_pci_runtime_idle, |
186 | }; | 186 | }; |
187 | 187 | ||
188 | static DEFINE_PCI_DEVICE_TABLE(ufshcd_pci_tbl) = { | 188 | static const struct pci_device_id ufshcd_pci_tbl[] = { |
189 | { PCI_VENDOR_ID_SAMSUNG, 0xC00C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 189 | { PCI_VENDOR_ID_SAMSUNG, 0xC00C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
190 | { } /* terminate list */ | 190 | { } /* terminate list */ |
191 | }; | 191 | }; |
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 569e7562fa3d..42543362f163 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c | |||
@@ -892,7 +892,7 @@ static int hvfb_remove(struct hv_device *hdev) | |||
892 | } | 892 | } |
893 | 893 | ||
894 | 894 | ||
895 | static DEFINE_PCI_DEVICE_TABLE(pci_stub_id_table) = { | 895 | static const struct pci_device_id pci_stub_id_table[] = { |
896 | { | 896 | { |
897 | .vendor = PCI_VENDOR_ID_MICROSOFT, | 897 | .vendor = PCI_VENDOR_ID_MICROSOFT, |
898 | .device = PCI_DEVICE_ID_HYPERV_VIDEO, | 898 | .device = PCI_DEVICE_ID_HYPERV_VIDEO, |
diff --git a/drivers/video/fbdev/i740fb.c b/drivers/video/fbdev/i740fb.c index ca7c9df193b0..a2b4204b42bb 100644 --- a/drivers/video/fbdev/i740fb.c +++ b/drivers/video/fbdev/i740fb.c | |||
@@ -1260,7 +1260,7 @@ fail: | |||
1260 | #define I740_ID_PCI 0x00d1 | 1260 | #define I740_ID_PCI 0x00d1 |
1261 | #define I740_ID_AGP 0x7800 | 1261 | #define I740_ID_AGP 0x7800 |
1262 | 1262 | ||
1263 | static DEFINE_PCI_DEVICE_TABLE(i740fb_id_table) = { | 1263 | static const struct pci_device_id i740fb_id_table[] = { |
1264 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, I740_ID_PCI) }, | 1264 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, I740_ID_PCI) }, |
1265 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, I740_ID_AGP) }, | 1265 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, I740_ID_AGP) }, |
1266 | { 0 } | 1266 | { 0 } |
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index d57a173685f3..259ba2661543 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c | |||
@@ -579,7 +579,7 @@ static void pcistub_remove(struct pci_dev *dev) | |||
579 | } | 579 | } |
580 | } | 580 | } |
581 | 581 | ||
582 | static DEFINE_PCI_DEVICE_TABLE(pcistub_ids) = { | 582 | static const struct pci_device_id pcistub_ids[] = { |
583 | { | 583 | { |
584 | .vendor = PCI_ANY_ID, | 584 | .vendor = PCI_ANY_ID, |
585 | .device = PCI_ANY_ID, | 585 | .device = PCI_ANY_ID, |
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c index 12be1fb512dd..c4b0434c7604 100644 --- a/sound/oss/kahlua.c +++ b/sound/oss/kahlua.c | |||
@@ -197,7 +197,7 @@ MODULE_LICENSE("GPL"); | |||
197 | * 5530 only. The 5510/5520 decode is different. | 197 | * 5530 only. The 5510/5520 decode is different. |
198 | */ | 198 | */ |
199 | 199 | ||
200 | static DEFINE_PCI_DEVICE_TABLE(id_tbl) = { | 200 | static const struct pci_device_id id_tbl[] = { |
201 | { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 }, | 201 | { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 }, |
202 | { } | 202 | { } |
203 | }; | 203 | }; |
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index 488f966adde3..7bfdf9c51416 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
@@ -1045,7 +1045,7 @@ snd_ad1889_remove(struct pci_dev *pci) | |||
1045 | snd_card_free(pci_get_drvdata(pci)); | 1045 | snd_card_free(pci_get_drvdata(pci)); |
1046 | } | 1046 | } |
1047 | 1047 | ||
1048 | static DEFINE_PCI_DEVICE_TABLE(snd_ad1889_ids) = { | 1048 | static const struct pci_device_id snd_ad1889_ids[] = { |
1049 | { PCI_DEVICE(PCI_VENDOR_ID_ANALOG_DEVICES, PCI_DEVICE_ID_AD1889JS) }, | 1049 | { PCI_DEVICE(PCI_VENDOR_ID_ANALOG_DEVICES, PCI_DEVICE_ID_AD1889JS) }, |
1050 | { 0, }, | 1050 | { 0, }, |
1051 | }; | 1051 | }; |
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index feb29c24cab1..af89e42b2160 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
@@ -263,7 +263,7 @@ struct snd_ali { | |||
263 | #endif | 263 | #endif |
264 | }; | 264 | }; |
265 | 265 | ||
266 | static DEFINE_PCI_DEVICE_TABLE(snd_ali_ids) = { | 266 | static const struct pci_device_id snd_ali_ids[] = { |
267 | {PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5451), 0, 0, 0}, | 267 | {PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5451), 0, 0, 0}, |
268 | {0, } | 268 | {0, } |
269 | }; | 269 | }; |
diff --git a/sound/pci/als300.c b/sound/pci/als300.c index cc9a15a1304b..7bb6ac565107 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c | |||
@@ -141,7 +141,7 @@ struct snd_als300_substream_data { | |||
141 | int block_counter_register; | 141 | int block_counter_register; |
142 | }; | 142 | }; |
143 | 143 | ||
144 | static DEFINE_PCI_DEVICE_TABLE(snd_als300_ids) = { | 144 | static const struct pci_device_id snd_als300_ids[] = { |
145 | { 0x4005, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300 }, | 145 | { 0x4005, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300 }, |
146 | { 0x4005, 0x0308, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300_PLUS }, | 146 | { 0x4005, 0x0308, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300_PLUS }, |
147 | { 0, } | 147 | { 0, } |
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index b751c381d25e..d3e6424ee656 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c | |||
@@ -116,7 +116,7 @@ struct snd_card_als4000 { | |||
116 | #endif | 116 | #endif |
117 | }; | 117 | }; |
118 | 118 | ||
119 | static DEFINE_PCI_DEVICE_TABLE(snd_als4000_ids) = { | 119 | static const struct pci_device_id snd_als4000_ids[] = { |
120 | { 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ALS4000 */ | 120 | { 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ALS4000 */ |
121 | { 0, } | 121 | { 0, } |
122 | }; | 122 | }; |
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index 901c9490398a..5017176bfaa1 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c | |||
@@ -2955,7 +2955,7 @@ static void snd_asihpi_remove(struct pci_dev *pci_dev) | |||
2955 | asihpi_adapter_remove(pci_dev); | 2955 | asihpi_adapter_remove(pci_dev); |
2956 | } | 2956 | } |
2957 | 2957 | ||
2958 | static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = { | 2958 | static const struct pci_device_id asihpi_pci_tbl[] = { |
2959 | {HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205, | 2959 | {HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205, |
2960 | HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID, 0, 0, | 2960 | HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID, 0, 0, |
2961 | (kernel_ulong_t)HPI_6205}, | 2961 | (kernel_ulong_t)HPI_6205}, |
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index ae07b4926dc2..7895c5d300c7 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c | |||
@@ -286,7 +286,7 @@ struct atiixp { | |||
286 | 286 | ||
287 | /* | 287 | /* |
288 | */ | 288 | */ |
289 | static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = { | 289 | static const struct pci_device_id snd_atiixp_ids[] = { |
290 | { PCI_VDEVICE(ATI, 0x4341), 0 }, /* SB200 */ | 290 | { PCI_VDEVICE(ATI, 0x4341), 0 }, /* SB200 */ |
291 | { PCI_VDEVICE(ATI, 0x4361), 0 }, /* SB300 */ | 291 | { PCI_VDEVICE(ATI, 0x4361), 0 }, /* SB300 */ |
292 | { PCI_VDEVICE(ATI, 0x4370), 0 }, /* SB400 */ | 292 | { PCI_VDEVICE(ATI, 0x4370), 0 }, /* SB400 */ |
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index b9dc96c5d21e..3c3241309a30 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
@@ -261,7 +261,7 @@ struct atiixp_modem { | |||
261 | 261 | ||
262 | /* | 262 | /* |
263 | */ | 263 | */ |
264 | static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = { | 264 | static const struct pci_device_id snd_atiixp_ids[] = { |
265 | { PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */ | 265 | { PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */ |
266 | { PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */ | 266 | { PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */ |
267 | { 0, } | 267 | { 0, } |
diff --git a/sound/pci/au88x0/au8810.c b/sound/pci/au88x0/au8810.c index aa51cc7771dd..1b2e34069eb3 100644 --- a/sound/pci/au88x0/au8810.c +++ b/sound/pci/au88x0/au8810.c | |||
@@ -1,6 +1,6 @@ | |||
1 | #include "au8810.h" | 1 | #include "au8810.h" |
2 | #include "au88x0.h" | 2 | #include "au88x0.h" |
3 | static DEFINE_PCI_DEVICE_TABLE(snd_vortex_ids) = { | 3 | static const struct pci_device_id snd_vortex_ids[] = { |
4 | {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE), 1,}, | 4 | {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE), 1,}, |
5 | {0,} | 5 | {0,} |
6 | }; | 6 | }; |
diff --git a/sound/pci/au88x0/au8820.c b/sound/pci/au88x0/au8820.c index 2f321e7306cd..74c53fa5f06b 100644 --- a/sound/pci/au88x0/au8820.c +++ b/sound/pci/au88x0/au8820.c | |||
@@ -1,6 +1,6 @@ | |||
1 | #include "au8820.h" | 1 | #include "au8820.h" |
2 | #include "au88x0.h" | 2 | #include "au88x0.h" |
3 | static DEFINE_PCI_DEVICE_TABLE(snd_vortex_ids) = { | 3 | static const struct pci_device_id snd_vortex_ids[] = { |
4 | {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), 0,}, | 4 | {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), 0,}, |
5 | {0,} | 5 | {0,} |
6 | }; | 6 | }; |
diff --git a/sound/pci/au88x0/au8830.c b/sound/pci/au88x0/au8830.c index 279b78f06d22..56f675aad3ad 100644 --- a/sound/pci/au88x0/au8830.c +++ b/sound/pci/au88x0/au8830.c | |||
@@ -1,6 +1,6 @@ | |||
1 | #include "au8830.h" | 1 | #include "au8830.h" |
2 | #include "au88x0.h" | 2 | #include "au88x0.h" |
3 | static DEFINE_PCI_DEVICE_TABLE(snd_vortex_ids) = { | 3 | static const struct pci_device_id snd_vortex_ids[] = { |
4 | {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2), 0,}, | 4 | {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2), 0,}, |
5 | {0,} | 5 | {0,} |
6 | }; | 6 | }; |
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 120d0d320a60..3878cf5de9a4 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c | |||
@@ -160,7 +160,7 @@ MODULE_PARM_DESC(id, "ID string for the Audiowerk2 soundcard."); | |||
160 | module_param_array(enable, bool, NULL, 0444); | 160 | module_param_array(enable, bool, NULL, 0444); |
161 | MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard."); | 161 | MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard."); |
162 | 162 | ||
163 | static DEFINE_PCI_DEVICE_TABLE(snd_aw2_ids) = { | 163 | static const struct pci_device_id snd_aw2_ids[] = { |
164 | {PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0, 0, | 164 | {PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0, 0, |
165 | 0, 0, 0}, | 165 | 0, 0, 0}, |
166 | {0} | 166 | {0} |
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index c9216c0a9c8b..5a69e26cb2fb 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c | |||
@@ -321,7 +321,7 @@ struct snd_azf3328 { | |||
321 | #endif | 321 | #endif |
322 | }; | 322 | }; |
323 | 323 | ||
324 | static DEFINE_PCI_DEVICE_TABLE(snd_azf3328_ids) = { | 324 | static const struct pci_device_id snd_azf3328_ids[] = { |
325 | { 0x122D, 0x50DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* PCI168/3328 */ | 325 | { 0x122D, 0x50DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* PCI168/3328 */ |
326 | { 0x122D, 0x80DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 3328 */ | 326 | { 0x122D, 0x80DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 3328 */ |
327 | { 0, } | 327 | { 0, } |
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 70951fd9b354..058b9973c09c 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
@@ -796,7 +796,7 @@ fail: | |||
796 | .driver_data = SND_BT87X_BOARD_ ## id } | 796 | .driver_data = SND_BT87X_BOARD_ ## id } |
797 | /* driver_data is the card id for that device */ | 797 | /* driver_data is the card id for that device */ |
798 | 798 | ||
799 | static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_ids) = { | 799 | static const struct pci_device_id snd_bt87x_ids[] = { |
800 | /* Hauppauge WinTV series */ | 800 | /* Hauppauge WinTV series */ |
801 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, GENERIC), | 801 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, GENERIC), |
802 | /* Hauppauge WinTV series */ | 802 | /* Hauppauge WinTV series */ |
@@ -966,7 +966,7 @@ static void snd_bt87x_remove(struct pci_dev *pci) | |||
966 | 966 | ||
967 | /* default entries for all Bt87x cards - it's not exported */ | 967 | /* default entries for all Bt87x cards - it's not exported */ |
968 | /* driver_data is set to 0 to call detection */ | 968 | /* driver_data is set to 0 to call detection */ |
969 | static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = { | 969 | static const struct pci_device_id snd_bt87x_default_ids[] = { |
970 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN), | 970 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN), |
971 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN), | 971 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN), |
972 | { } | 972 | { } |
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index f94cc6e97d4a..96af33965b51 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1968,7 +1968,7 @@ static SIMPLE_DEV_PM_OPS(snd_ca0106_pm, snd_ca0106_suspend, snd_ca0106_resume); | |||
1968 | #endif | 1968 | #endif |
1969 | 1969 | ||
1970 | // PCI IDs | 1970 | // PCI IDs |
1971 | static DEFINE_PCI_DEVICE_TABLE(snd_ca0106_ids) = { | 1971 | static const struct pci_device_id snd_ca0106_ids[] = { |
1972 | { PCI_VDEVICE(CREATIVE, 0x0007), 0 }, /* Audigy LS or Live 24bit */ | 1972 | { PCI_VDEVICE(CREATIVE, 0x0007), 0 }, /* Audigy LS or Live 24bit */ |
1973 | { 0, } | 1973 | { 0, } |
1974 | }; | 1974 | }; |
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 12c318e175f4..85ed40339db9 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
@@ -2803,7 +2803,7 @@ static inline void snd_cmipci_proc_init(struct cmipci *cm) {} | |||
2803 | #endif | 2803 | #endif |
2804 | 2804 | ||
2805 | 2805 | ||
2806 | static DEFINE_PCI_DEVICE_TABLE(snd_cmipci_ids) = { | 2806 | static const struct pci_device_id snd_cmipci_ids[] = { |
2807 | {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A), 0}, | 2807 | {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A), 0}, |
2808 | {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B), 0}, | 2808 | {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B), 0}, |
2809 | {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738), 0}, | 2809 | {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738), 0}, |
@@ -3026,7 +3026,7 @@ static int snd_cmipci_create(struct snd_card *card, struct pci_dev *pci, | |||
3026 | int integrated_midi = 0; | 3026 | int integrated_midi = 0; |
3027 | char modelstr[16]; | 3027 | char modelstr[16]; |
3028 | int pcm_index, pcm_spdif_index; | 3028 | int pcm_index, pcm_spdif_index; |
3029 | static DEFINE_PCI_DEVICE_TABLE(intel_82437vx) = { | 3029 | static const struct pci_device_id intel_82437vx[] = { |
3030 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) }, | 3030 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) }, |
3031 | { }, | 3031 | { }, |
3032 | }; | 3032 | }; |
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 43d1f912c641..4c49b5c8a7b3 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
@@ -494,7 +494,7 @@ struct cs4281 { | |||
494 | 494 | ||
495 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id); | 495 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id); |
496 | 496 | ||
497 | static DEFINE_PCI_DEVICE_TABLE(snd_cs4281_ids) = { | 497 | static const struct pci_device_id snd_cs4281_ids[] = { |
498 | { PCI_VDEVICE(CIRRUS, 0x6005), 0, }, /* CS4281 */ | 498 | { PCI_VDEVICE(CIRRUS, 0x6005), 0, }, /* CS4281 */ |
499 | { 0, } | 499 | { 0, } |
500 | }; | 500 | }; |
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c index af0eacbc8bd2..6a6858c07826 100644 --- a/sound/pci/cs46xx/cs46xx.c +++ b/sound/pci/cs46xx/cs46xx.c | |||
@@ -64,7 +64,7 @@ MODULE_PARM_DESC(thinkpad, "Force to enable Thinkpad's CLKRUN control."); | |||
64 | module_param_array(mmap_valid, bool, NULL, 0444); | 64 | module_param_array(mmap_valid, bool, NULL, 0444); |
65 | MODULE_PARM_DESC(mmap_valid, "Support OSS mmap."); | 65 | MODULE_PARM_DESC(mmap_valid, "Support OSS mmap."); |
66 | 66 | ||
67 | static DEFINE_PCI_DEVICE_TABLE(snd_cs46xx_ids) = { | 67 | static const struct pci_device_id snd_cs46xx_ids[] = { |
68 | { PCI_VDEVICE(CIRRUS, 0x6001), 0, }, /* CS4280 */ | 68 | { PCI_VDEVICE(CIRRUS, 0x6001), 0, }, /* CS4280 */ |
69 | { PCI_VDEVICE(CIRRUS, 0x6003), 0, }, /* CS4612 */ | 69 | { PCI_VDEVICE(CIRRUS, 0x6003), 0, }, /* CS4612 */ |
70 | { PCI_VDEVICE(CIRRUS, 0x6004), 0, }, /* CS4615 */ | 70 | { PCI_VDEVICE(CIRRUS, 0x6004), 0, }, /* CS4615 */ |
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c index b4e0ff6a99a3..b1025507a467 100644 --- a/sound/pci/cs5530.c +++ b/sound/pci/cs5530.c | |||
@@ -66,7 +66,7 @@ struct snd_cs5530 { | |||
66 | unsigned long pci_base; | 66 | unsigned long pci_base; |
67 | }; | 67 | }; |
68 | 68 | ||
69 | static DEFINE_PCI_DEVICE_TABLE(snd_cs5530_ids) = { | 69 | static const struct pci_device_id snd_cs5530_ids[] = { |
70 | {PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID, | 70 | {PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID, |
71 | PCI_ANY_ID, 0, 0}, | 71 | PCI_ANY_ID, 0, 0}, |
72 | {0,} | 72 | {0,} |
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c index edcbbda5c488..16288e4d338a 100644 --- a/sound/pci/cs5535audio/cs5535audio.c +++ b/sound/pci/cs5535audio/cs5535audio.c | |||
@@ -66,7 +66,7 @@ MODULE_PARM_DESC(id, "ID string for " DRIVER_NAME); | |||
66 | module_param_array(enable, bool, NULL, 0444); | 66 | module_param_array(enable, bool, NULL, 0444); |
67 | MODULE_PARM_DESC(enable, "Enable " DRIVER_NAME); | 67 | MODULE_PARM_DESC(enable, "Enable " DRIVER_NAME); |
68 | 68 | ||
69 | static DEFINE_PCI_DEVICE_TABLE(snd_cs5535audio_ids) = { | 69 | static const struct pci_device_id snd_cs5535audio_ids[] = { |
70 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) }, | 70 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) }, |
71 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO) }, | 71 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO) }, |
72 | {} | 72 | {} |
diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c index 98426d09c8bd..8f8b566a1b35 100644 --- a/sound/pci/ctxfi/xfi.c +++ b/sound/pci/ctxfi/xfi.c | |||
@@ -44,7 +44,7 @@ MODULE_PARM_DESC(enable, "Enable Creative X-Fi driver"); | |||
44 | module_param_array(subsystem, int, NULL, 0444); | 44 | module_param_array(subsystem, int, NULL, 0444); |
45 | MODULE_PARM_DESC(subsystem, "Override subsystem ID for Creative X-Fi driver"); | 45 | MODULE_PARM_DESC(subsystem, "Override subsystem ID for Creative X-Fi driver"); |
46 | 46 | ||
47 | static DEFINE_PCI_DEVICE_TABLE(ct_pci_dev_ids) = { | 47 | static const struct pci_device_id ct_pci_dev_ids[] = { |
48 | /* only X-Fi is supported, so... */ | 48 | /* only X-Fi is supported, so... */ |
49 | { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K1), | 49 | { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K1), |
50 | .driver_data = ATC20K1, | 50 | .driver_data = ATC20K1, |
diff --git a/sound/pci/echoaudio/darla20.c b/sound/pci/echoaudio/darla20.c index d47e72ae2ab3..4632946205a8 100644 --- a/sound/pci/echoaudio/darla20.c +++ b/sound/pci/echoaudio/darla20.c | |||
@@ -63,7 +63,7 @@ static const struct firmware card_fw[] = { | |||
63 | {0, "darla20_dsp.fw"} | 63 | {0, "darla20_dsp.fw"} |
64 | }; | 64 | }; |
65 | 65 | ||
66 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 66 | static const struct pci_device_id snd_echo_ids[] = { |
67 | {0x1057, 0x1801, 0xECC0, 0x0010, 0, 0, 0}, /* DSP 56301 Darla20 rev.0 */ | 67 | {0x1057, 0x1801, 0xECC0, 0x0010, 0, 0, 0}, /* DSP 56301 Darla20 rev.0 */ |
68 | {0,} | 68 | {0,} |
69 | }; | 69 | }; |
diff --git a/sound/pci/echoaudio/darla24.c b/sound/pci/echoaudio/darla24.c index 413acf702e3b..f81c839cc887 100644 --- a/sound/pci/echoaudio/darla24.c +++ b/sound/pci/echoaudio/darla24.c | |||
@@ -67,7 +67,7 @@ static const struct firmware card_fw[] = { | |||
67 | {0, "darla24_dsp.fw"} | 67 | {0, "darla24_dsp.fw"} |
68 | }; | 68 | }; |
69 | 69 | ||
70 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 70 | static const struct pci_device_id snd_echo_ids[] = { |
71 | {0x1057, 0x1801, 0xECC0, 0x0040, 0, 0, 0}, /* DSP 56301 Darla24 rev.0 */ | 71 | {0x1057, 0x1801, 0xECC0, 0x0040, 0, 0, 0}, /* DSP 56301 Darla24 rev.0 */ |
72 | {0x1057, 0x1801, 0xECC0, 0x0041, 0, 0, 0}, /* DSP 56301 Darla24 rev.1 */ | 72 | {0x1057, 0x1801, 0xECC0, 0x0041, 0, 0, 0}, /* DSP 56301 Darla24 rev.1 */ |
73 | {0,} | 73 | {0,} |
diff --git a/sound/pci/echoaudio/echo3g.c b/sound/pci/echoaudio/echo3g.c index 1ec4edca060d..3a5346c33d76 100644 --- a/sound/pci/echoaudio/echo3g.c +++ b/sound/pci/echoaudio/echo3g.c | |||
@@ -81,7 +81,7 @@ static const struct firmware card_fw[] = { | |||
81 | {0, "3g_asic.fw"} | 81 | {0, "3g_asic.fw"} |
82 | }; | 82 | }; |
83 | 83 | ||
84 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 84 | static const struct pci_device_id snd_echo_ids[] = { |
85 | {0x1057, 0x3410, 0xECC0, 0x0100, 0, 0, 0}, /* Echo 3G */ | 85 | {0x1057, 0x3410, 0xECC0, 0x0100, 0, 0, 0}, /* Echo 3G */ |
86 | {0,} | 86 | {0,} |
87 | }; | 87 | }; |
diff --git a/sound/pci/echoaudio/gina20.c b/sound/pci/echoaudio/gina20.c index 039125b7e475..9cb81c500824 100644 --- a/sound/pci/echoaudio/gina20.c +++ b/sound/pci/echoaudio/gina20.c | |||
@@ -67,7 +67,7 @@ static const struct firmware card_fw[] = { | |||
67 | {0, "gina20_dsp.fw"} | 67 | {0, "gina20_dsp.fw"} |
68 | }; | 68 | }; |
69 | 69 | ||
70 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 70 | static const struct pci_device_id snd_echo_ids[] = { |
71 | {0x1057, 0x1801, 0xECC0, 0x0020, 0, 0, 0}, /* DSP 56301 Gina20 rev.0 */ | 71 | {0x1057, 0x1801, 0xECC0, 0x0020, 0, 0, 0}, /* DSP 56301 Gina20 rev.0 */ |
72 | {0,} | 72 | {0,} |
73 | }; | 73 | }; |
diff --git a/sound/pci/echoaudio/gina24.c b/sound/pci/echoaudio/gina24.c index 5e966f6ffaa3..35d3e6eac990 100644 --- a/sound/pci/echoaudio/gina24.c +++ b/sound/pci/echoaudio/gina24.c | |||
@@ -85,7 +85,7 @@ static const struct firmware card_fw[] = { | |||
85 | {0, "gina24_361_asic.fw"} | 85 | {0, "gina24_361_asic.fw"} |
86 | }; | 86 | }; |
87 | 87 | ||
88 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 88 | static const struct pci_device_id snd_echo_ids[] = { |
89 | {0x1057, 0x1801, 0xECC0, 0x0050, 0, 0, 0}, /* DSP 56301 Gina24 rev.0 */ | 89 | {0x1057, 0x1801, 0xECC0, 0x0050, 0, 0, 0}, /* DSP 56301 Gina24 rev.0 */ |
90 | {0x1057, 0x1801, 0xECC0, 0x0051, 0, 0, 0}, /* DSP 56301 Gina24 rev.1 */ | 90 | {0x1057, 0x1801, 0xECC0, 0x0051, 0, 0, 0}, /* DSP 56301 Gina24 rev.1 */ |
91 | {0x1057, 0x3410, 0xECC0, 0x0050, 0, 0, 0}, /* DSP 56361 Gina24 rev.0 */ | 91 | {0x1057, 0x3410, 0xECC0, 0x0050, 0, 0, 0}, /* DSP 56361 Gina24 rev.0 */ |
diff --git a/sound/pci/echoaudio/indigo.c b/sound/pci/echoaudio/indigo.c index c166b7eea268..8d91842d1268 100644 --- a/sound/pci/echoaudio/indigo.c +++ b/sound/pci/echoaudio/indigo.c | |||
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = { | |||
68 | {0, "indigo_dsp.fw"} | 68 | {0, "indigo_dsp.fw"} |
69 | }; | 69 | }; |
70 | 70 | ||
71 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 71 | static const struct pci_device_id snd_echo_ids[] = { |
72 | {0x1057, 0x3410, 0xECC0, 0x0090, 0, 0, 0}, /* Indigo */ | 72 | {0x1057, 0x3410, 0xECC0, 0x0090, 0, 0, 0}, /* Indigo */ |
73 | {0,} | 73 | {0,} |
74 | }; | 74 | }; |
diff --git a/sound/pci/echoaudio/indigodj.c b/sound/pci/echoaudio/indigodj.c index a3ef3b992f40..289cb969f5b9 100644 --- a/sound/pci/echoaudio/indigodj.c +++ b/sound/pci/echoaudio/indigodj.c | |||
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = { | |||
68 | {0, "indigo_dj_dsp.fw"} | 68 | {0, "indigo_dj_dsp.fw"} |
69 | }; | 69 | }; |
70 | 70 | ||
71 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 71 | static const struct pci_device_id snd_echo_ids[] = { |
72 | {0x1057, 0x3410, 0xECC0, 0x00B0, 0, 0, 0}, /* Indigo DJ*/ | 72 | {0x1057, 0x3410, 0xECC0, 0x00B0, 0, 0, 0}, /* Indigo DJ*/ |
73 | {0,} | 73 | {0,} |
74 | }; | 74 | }; |
diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c index f516444fc02d..201688ee50fa 100644 --- a/sound/pci/echoaudio/indigodjx.c +++ b/sound/pci/echoaudio/indigodjx.c | |||
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = { | |||
68 | {0, "indigo_djx_dsp.fw"} | 68 | {0, "indigo_djx_dsp.fw"} |
69 | }; | 69 | }; |
70 | 70 | ||
71 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 71 | static const struct pci_device_id snd_echo_ids[] = { |
72 | {0x1057, 0x3410, 0xECC0, 0x00E0, 0, 0, 0}, /* Indigo DJx*/ | 72 | {0x1057, 0x3410, 0xECC0, 0x00E0, 0, 0, 0}, /* Indigo DJx*/ |
73 | {0,} | 73 | {0,} |
74 | }; | 74 | }; |
diff --git a/sound/pci/echoaudio/indigoio.c b/sound/pci/echoaudio/indigoio.c index c22c82fd1f99..405a3f2e496f 100644 --- a/sound/pci/echoaudio/indigoio.c +++ b/sound/pci/echoaudio/indigoio.c | |||
@@ -69,7 +69,7 @@ static const struct firmware card_fw[] = { | |||
69 | {0, "indigo_io_dsp.fw"} | 69 | {0, "indigo_io_dsp.fw"} |
70 | }; | 70 | }; |
71 | 71 | ||
72 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 72 | static const struct pci_device_id snd_echo_ids[] = { |
73 | {0x1057, 0x3410, 0xECC0, 0x00A0, 0, 0, 0}, /* Indigo IO*/ | 73 | {0x1057, 0x3410, 0xECC0, 0x00A0, 0, 0, 0}, /* Indigo IO*/ |
74 | {0,} | 74 | {0,} |
75 | }; | 75 | }; |
diff --git a/sound/pci/echoaudio/indigoiox.c b/sound/pci/echoaudio/indigoiox.c index 86cf2d071758..e145b688148a 100644 --- a/sound/pci/echoaudio/indigoiox.c +++ b/sound/pci/echoaudio/indigoiox.c | |||
@@ -69,7 +69,7 @@ static const struct firmware card_fw[] = { | |||
69 | {0, "indigo_iox_dsp.fw"} | 69 | {0, "indigo_iox_dsp.fw"} |
70 | }; | 70 | }; |
71 | 71 | ||
72 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 72 | static const struct pci_device_id snd_echo_ids[] = { |
73 | {0x1057, 0x3410, 0xECC0, 0x00D0, 0, 0, 0}, /* Indigo IOx */ | 73 | {0x1057, 0x3410, 0xECC0, 0x00D0, 0, 0, 0}, /* Indigo IOx */ |
74 | {0,} | 74 | {0,} |
75 | }; | 75 | }; |
diff --git a/sound/pci/echoaudio/layla20.c b/sound/pci/echoaudio/layla20.c index 6a027f3931cc..b392dd776b71 100644 --- a/sound/pci/echoaudio/layla20.c +++ b/sound/pci/echoaudio/layla20.c | |||
@@ -76,7 +76,7 @@ static const struct firmware card_fw[] = { | |||
76 | {0, "layla20_asic.fw"} | 76 | {0, "layla20_asic.fw"} |
77 | }; | 77 | }; |
78 | 78 | ||
79 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 79 | static const struct pci_device_id snd_echo_ids[] = { |
80 | {0x1057, 0x1801, 0xECC0, 0x0030, 0, 0, 0}, /* DSP 56301 Layla20 rev.0 */ | 80 | {0x1057, 0x1801, 0xECC0, 0x0030, 0, 0, 0}, /* DSP 56301 Layla20 rev.0 */ |
81 | {0x1057, 0x1801, 0xECC0, 0x0031, 0, 0, 0}, /* DSP 56301 Layla20 rev.1 */ | 81 | {0x1057, 0x1801, 0xECC0, 0x0031, 0, 0, 0}, /* DSP 56301 Layla20 rev.1 */ |
82 | {0,} | 82 | {0,} |
diff --git a/sound/pci/echoaudio/layla24.c b/sound/pci/echoaudio/layla24.c index 96a5991aca8f..bc7f730b0ec6 100644 --- a/sound/pci/echoaudio/layla24.c +++ b/sound/pci/echoaudio/layla24.c | |||
@@ -87,7 +87,7 @@ static const struct firmware card_fw[] = { | |||
87 | {0, "layla24_2S_asic.fw"} | 87 | {0, "layla24_2S_asic.fw"} |
88 | }; | 88 | }; |
89 | 89 | ||
90 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 90 | static const struct pci_device_id snd_echo_ids[] = { |
91 | {0x1057, 0x3410, 0xECC0, 0x0060, 0, 0, 0}, /* DSP 56361 Layla24 rev.0 */ | 91 | {0x1057, 0x3410, 0xECC0, 0x0060, 0, 0, 0}, /* DSP 56361 Layla24 rev.0 */ |
92 | {0,} | 92 | {0,} |
93 | }; | 93 | }; |
diff --git a/sound/pci/echoaudio/mia.c b/sound/pci/echoaudio/mia.c index b8ce27e67e3a..27a9a6e5db2d 100644 --- a/sound/pci/echoaudio/mia.c +++ b/sound/pci/echoaudio/mia.c | |||
@@ -77,7 +77,7 @@ static const struct firmware card_fw[] = { | |||
77 | {0, "mia_dsp.fw"} | 77 | {0, "mia_dsp.fw"} |
78 | }; | 78 | }; |
79 | 79 | ||
80 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 80 | static const struct pci_device_id snd_echo_ids[] = { |
81 | {0x1057, 0x3410, 0xECC0, 0x0080, 0, 0, 0}, /* DSP 56361 Mia rev.0 */ | 81 | {0x1057, 0x3410, 0xECC0, 0x0080, 0, 0, 0}, /* DSP 56361 Mia rev.0 */ |
82 | {0x1057, 0x3410, 0xECC0, 0x0081, 0, 0, 0}, /* DSP 56361 Mia rev.1 */ | 82 | {0x1057, 0x3410, 0xECC0, 0x0081, 0, 0, 0}, /* DSP 56361 Mia rev.1 */ |
83 | {0,} | 83 | {0,} |
diff --git a/sound/pci/echoaudio/mona.c b/sound/pci/echoaudio/mona.c index 1283bfb26b2e..3d13875c303d 100644 --- a/sound/pci/echoaudio/mona.c +++ b/sound/pci/echoaudio/mona.c | |||
@@ -92,7 +92,7 @@ static const struct firmware card_fw[] = { | |||
92 | {0, "mona_2_asic.fw"} | 92 | {0, "mona_2_asic.fw"} |
93 | }; | 93 | }; |
94 | 94 | ||
95 | static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = { | 95 | static const struct pci_device_id snd_echo_ids[] = { |
96 | {0x1057, 0x1801, 0xECC0, 0x0070, 0, 0, 0}, /* DSP 56301 Mona rev.0 */ | 96 | {0x1057, 0x1801, 0xECC0, 0x0070, 0, 0, 0}, /* DSP 56301 Mona rev.0 */ |
97 | {0x1057, 0x1801, 0xECC0, 0x0071, 0, 0, 0}, /* DSP 56301 Mona rev.1 */ | 97 | {0x1057, 0x1801, 0xECC0, 0x0071, 0, 0, 0}, /* DSP 56301 Mona rev.1 */ |
98 | {0x1057, 0x1801, 0xECC0, 0x0072, 0, 0, 0}, /* DSP 56301 Mona rev.2 */ | 98 | {0x1057, 0x1801, 0xECC0, 0x0072, 0, 0, 0}, /* DSP 56301 Mona rev.2 */ |
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index ad9d9f8b48ed..4c171636efcd 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c | |||
@@ -79,7 +79,7 @@ MODULE_PARM_DESC(delay_pcm_irq, "Delay PCM interrupt by specified number of samp | |||
79 | /* | 79 | /* |
80 | * Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value Model:SB0400 | 80 | * Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value Model:SB0400 |
81 | */ | 81 | */ |
82 | static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1_ids) = { | 82 | static const struct pci_device_id snd_emu10k1_ids[] = { |
83 | { PCI_VDEVICE(CREATIVE, 0x0002), 0 }, /* EMU10K1 */ | 83 | { PCI_VDEVICE(CREATIVE, 0x0002), 0 }, /* EMU10K1 */ |
84 | { PCI_VDEVICE(CREATIVE, 0x0004), 1 }, /* Audigy */ | 84 | { PCI_VDEVICE(CREATIVE, 0x0004), 1 }, /* Audigy */ |
85 | { PCI_VDEVICE(CREATIVE, 0x0008), 1 }, /* Audigy 2 Value SB0400 */ | 85 | { PCI_VDEVICE(CREATIVE, 0x0008), 1 }, /* Audigy 2 Value SB0400 */ |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index efe017526977..e223de1408c0 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -1634,7 +1634,7 @@ static void snd_emu10k1x_remove(struct pci_dev *pci) | |||
1634 | } | 1634 | } |
1635 | 1635 | ||
1636 | // PCI IDs | 1636 | // PCI IDs |
1637 | static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1x_ids) = { | 1637 | static const struct pci_device_id snd_emu10k1x_ids[] = { |
1638 | { PCI_VDEVICE(CREATIVE, 0x0006), 0 }, /* Dell OEM version (EMU10K1) */ | 1638 | { PCI_VDEVICE(CREATIVE, 0x0006), 0 }, /* Dell OEM version (EMU10K1) */ |
1639 | { 0, } | 1639 | { 0, } |
1640 | }; | 1640 | }; |
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 29cd339ffc37..d94cb3ca7a64 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
@@ -446,7 +446,7 @@ struct ensoniq { | |||
446 | 446 | ||
447 | static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id); | 447 | static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id); |
448 | 448 | ||
449 | static DEFINE_PCI_DEVICE_TABLE(snd_audiopci_ids) = { | 449 | static const struct pci_device_id snd_audiopci_ids[] = { |
450 | #ifdef CHIP1370 | 450 | #ifdef CHIP1370 |
451 | { PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */ | 451 | { PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */ |
452 | #endif | 452 | #endif |
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 34d95bf916b5..639962443ccc 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
@@ -243,7 +243,7 @@ struct es1938 { | |||
243 | 243 | ||
244 | static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id); | 244 | static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id); |
245 | 245 | ||
246 | static DEFINE_PCI_DEVICE_TABLE(snd_es1938_ids) = { | 246 | static const struct pci_device_id snd_es1938_ids[] = { |
247 | { PCI_VDEVICE(ESS, 0x1969), 0, }, /* Solo-1 */ | 247 | { PCI_VDEVICE(ESS, 0x1969), 0, }, /* Solo-1 */ |
248 | { 0, } | 248 | { 0, } |
249 | }; | 249 | }; |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 5bb1cf603301..a9956a7c5677 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -570,7 +570,7 @@ struct es1968 { | |||
570 | 570 | ||
571 | static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id); | 571 | static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id); |
572 | 572 | ||
573 | static DEFINE_PCI_DEVICE_TABLE(snd_es1968_ids) = { | 573 | static const struct pci_device_id snd_es1968_ids[] = { |
574 | /* Maestro 1 */ | 574 | /* Maestro 1 */ |
575 | { 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TYPE_MAESTRO }, | 575 | { 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TYPE_MAESTRO }, |
576 | /* Maestro 2 */ | 576 | /* Maestro 2 */ |
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index 529f5f4f4c9c..c5038303a126 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c | |||
@@ -218,7 +218,7 @@ struct fm801 { | |||
218 | #endif | 218 | #endif |
219 | }; | 219 | }; |
220 | 220 | ||
221 | static DEFINE_PCI_DEVICE_TABLE(snd_fm801_ids) = { | 221 | static const struct pci_device_id snd_fm801_ids[] = { |
222 | { 0x1319, 0x0801, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, }, /* FM801 */ | 222 | { 0x1319, 0x0801, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, }, /* FM801 */ |
223 | { 0x5213, 0x0510, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, }, /* Gallant Odyssey Sound 4 */ | 223 | { 0x5213, 0x0510, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, }, /* Gallant Odyssey Sound 4 */ |
224 | { 0, } | 224 | { 0, } |
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index d9b9e4595f17..87f7fc41d4f2 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -105,7 +105,7 @@ module_param_array(dxr_enable, int, NULL, 0444); | |||
105 | MODULE_PARM_DESC(dxr_enable, "Enable DXR support for Terratec DMX6FIRE."); | 105 | MODULE_PARM_DESC(dxr_enable, "Enable DXR support for Terratec DMX6FIRE."); |
106 | 106 | ||
107 | 107 | ||
108 | static DEFINE_PCI_DEVICE_TABLE(snd_ice1712_ids) = { | 108 | static const struct pci_device_id snd_ice1712_ids[] = { |
109 | { PCI_VDEVICE(ICE, PCI_DEVICE_ID_ICE_1712), 0 }, /* ICE1712 */ | 109 | { PCI_VDEVICE(ICE, PCI_DEVICE_ID_ICE_1712), 0 }, /* ICE1712 */ |
110 | { 0, } | 110 | { 0, } |
111 | }; | 111 | }; |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 5e7948f3efe9..08cb08ac85e6 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -94,7 +94,7 @@ MODULE_PARM_DESC(model, "Use the given board model."); | |||
94 | 94 | ||
95 | 95 | ||
96 | /* Both VT1720 and VT1724 have the same PCI IDs */ | 96 | /* Both VT1720 and VT1724 have the same PCI IDs */ |
97 | static DEFINE_PCI_DEVICE_TABLE(snd_vt1724_ids) = { | 97 | static const struct pci_device_id snd_vt1724_ids[] = { |
98 | { PCI_VDEVICE(ICE, PCI_DEVICE_ID_VT1724), 0 }, | 98 | { PCI_VDEVICE(ICE, PCI_DEVICE_ID_VT1724), 0 }, |
99 | { 0, } | 99 | { 0, } |
100 | }; | 100 | }; |
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index c91860e0a28d..4a28252a42b9 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -430,7 +430,7 @@ struct intel8x0 { | |||
430 | u32 int_sta_mask; /* interrupt status mask */ | 430 | u32 int_sta_mask; /* interrupt status mask */ |
431 | }; | 431 | }; |
432 | 432 | ||
433 | static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0_ids) = { | 433 | static const struct pci_device_id snd_intel8x0_ids[] = { |
434 | { PCI_VDEVICE(INTEL, 0x2415), DEVICE_INTEL }, /* 82801AA */ | 434 | { PCI_VDEVICE(INTEL, 0x2415), DEVICE_INTEL }, /* 82801AA */ |
435 | { PCI_VDEVICE(INTEL, 0x2425), DEVICE_INTEL }, /* 82901AB */ | 435 | { PCI_VDEVICE(INTEL, 0x2425), DEVICE_INTEL }, /* 82901AB */ |
436 | { PCI_VDEVICE(INTEL, 0x2445), DEVICE_INTEL }, /* 82801BA */ | 436 | { PCI_VDEVICE(INTEL, 0x2445), DEVICE_INTEL }, /* 82801BA */ |
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index b54d3e93cab1..6b40235be13c 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
@@ -219,7 +219,7 @@ struct intel8x0m { | |||
219 | unsigned int pcm_pos_shift; | 219 | unsigned int pcm_pos_shift; |
220 | }; | 220 | }; |
221 | 221 | ||
222 | static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = { | 222 | static const struct pci_device_id snd_intel8x0m_ids[] = { |
223 | { PCI_VDEVICE(INTEL, 0x2416), DEVICE_INTEL }, /* 82801AA */ | 223 | { PCI_VDEVICE(INTEL, 0x2416), DEVICE_INTEL }, /* 82801AA */ |
224 | { PCI_VDEVICE(INTEL, 0x2426), DEVICE_INTEL }, /* 82901AB */ | 224 | { PCI_VDEVICE(INTEL, 0x2426), DEVICE_INTEL }, /* 82901AB */ |
225 | { PCI_VDEVICE(INTEL, 0x2446), DEVICE_INTEL }, /* 82801BA */ | 225 | { PCI_VDEVICE(INTEL, 0x2446), DEVICE_INTEL }, /* 82801BA */ |
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 8f36d77f01e5..9fe549b2efdf 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c | |||
@@ -418,7 +418,7 @@ module_param_array(enable, bool, NULL, 0444); | |||
418 | MODULE_PARM_DESC(enable, "Enable Korg 1212 soundcard."); | 418 | MODULE_PARM_DESC(enable, "Enable Korg 1212 soundcard."); |
419 | MODULE_AUTHOR("Haroldo Gamal <gamal@alternex.com.br>"); | 419 | MODULE_AUTHOR("Haroldo Gamal <gamal@alternex.com.br>"); |
420 | 420 | ||
421 | static DEFINE_PCI_DEVICE_TABLE(snd_korg1212_ids) = { | 421 | static const struct pci_device_id snd_korg1212_ids[] = { |
422 | { | 422 | { |
423 | .vendor = 0x10b5, | 423 | .vendor = 0x10b5, |
424 | .device = 0x906d, | 424 | .device = 0x906d, |
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c index 68824cdd137d..a75c8dc66dec 100644 --- a/sound/pci/lola/lola.c +++ b/sound/pci/lola/lola.c | |||
@@ -760,7 +760,7 @@ static void lola_remove(struct pci_dev *pci) | |||
760 | } | 760 | } |
761 | 761 | ||
762 | /* PCI IDs */ | 762 | /* PCI IDs */ |
763 | static DEFINE_PCI_DEVICE_TABLE(lola_ids) = { | 763 | static const struct pci_device_id lola_ids[] = { |
764 | { PCI_VDEVICE(DIGIGRAM, 0x0001) }, | 764 | { PCI_VDEVICE(DIGIGRAM, 0x0001) }, |
765 | { 0, } | 765 | { 0, } |
766 | }; | 766 | }; |
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c index 27f60ce8a55c..a671f0865f71 100644 --- a/sound/pci/lx6464es/lx6464es.c +++ b/sound/pci/lx6464es/lx6464es.c | |||
@@ -56,7 +56,7 @@ static const char card_name[] = "LX6464ES"; | |||
56 | 56 | ||
57 | #define PCI_DEVICE_ID_PLX_LX6464ES PCI_DEVICE_ID_PLX_9056 | 57 | #define PCI_DEVICE_ID_PLX_LX6464ES PCI_DEVICE_ID_PLX_9056 |
58 | 58 | ||
59 | static DEFINE_PCI_DEVICE_TABLE(snd_lx6464es_ids) = { | 59 | static const struct pci_device_id snd_lx6464es_ids[] = { |
60 | { PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES), | 60 | { PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES), |
61 | .subvendor = PCI_VENDOR_ID_DIGIGRAM, | 61 | .subvendor = PCI_VENDOR_ID_DIGIGRAM, |
62 | .subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM | 62 | .subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM |
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 0d3ea3e79952..98823d11d485 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
@@ -800,7 +800,7 @@ struct snd_m3 { | |||
800 | /* | 800 | /* |
801 | * pci ids | 801 | * pci ids |
802 | */ | 802 | */ |
803 | static DEFINE_PCI_DEVICE_TABLE(snd_m3_ids) = { | 803 | static const struct pci_device_id snd_m3_ids[] = { |
804 | {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID, | 804 | {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID, |
805 | PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0}, | 805 | PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0}, |
806 | {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO, PCI_ANY_ID, PCI_ANY_ID, | 806 | {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO, PCI_ANY_ID, PCI_ANY_ID, |
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index a93e7af51eed..75fc342cff2a 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
@@ -61,7 +61,7 @@ MODULE_PARM_DESC(enable, "Enable Digigram " CARD_NAME " soundcard."); | |||
61 | /* | 61 | /* |
62 | */ | 62 | */ |
63 | 63 | ||
64 | static DEFINE_PCI_DEVICE_TABLE(snd_mixart_ids) = { | 64 | static const struct pci_device_id snd_mixart_ids[] = { |
65 | { PCI_VDEVICE(MOTOROLA, 0x0003), 0, }, /* MC8240 */ | 65 | { PCI_VDEVICE(MOTOROLA, 0x0003), 0, }, /* MC8240 */ |
66 | { 0, } | 66 | { 0, } |
67 | }; | 67 | }; |
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index ddc60215cc10..4e41a4e29a1e 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c | |||
@@ -262,7 +262,7 @@ struct nm256 { | |||
262 | /* | 262 | /* |
263 | * PCI ids | 263 | * PCI ids |
264 | */ | 264 | */ |
265 | static DEFINE_PCI_DEVICE_TABLE(snd_nm256_ids) = { | 265 | static const struct pci_device_id snd_nm256_ids[] = { |
266 | {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO), 0}, | 266 | {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO), 0}, |
267 | {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO), 0}, | 267 | {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO), 0}, |
268 | {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO), 0}, | 268 | {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO), 0}, |
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index ada6c256378e..74afb6b75976 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -97,7 +97,7 @@ enum { | |||
97 | MODEL_XONAR_DGX, | 97 | MODEL_XONAR_DGX, |
98 | }; | 98 | }; |
99 | 99 | ||
100 | static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = { | 100 | static const struct pci_device_id oxygen_ids[] = { |
101 | /* C-Media's reference design */ | 101 | /* C-Media's reference design */ |
102 | { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF }, | 102 | { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF }, |
103 | { OXYGEN_PCI_SUBID(0x10b0, 0x0217), .driver_data = MODEL_CMEDIA_REF }, | 103 | { OXYGEN_PCI_SUBID(0x10b0, 0x0217), .driver_data = MODEL_CMEDIA_REF }, |
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index dbbbacfd535e..7b317a28a19c 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
@@ -41,7 +41,7 @@ MODULE_PARM_DESC(id, "ID string"); | |||
41 | module_param_array(enable, bool, NULL, 0444); | 41 | module_param_array(enable, bool, NULL, 0444); |
42 | MODULE_PARM_DESC(enable, "enable card"); | 42 | MODULE_PARM_DESC(enable, "enable card"); |
43 | 43 | ||
44 | static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = { | 44 | static const struct pci_device_id xonar_ids[] = { |
45 | { OXYGEN_PCI_SUBID(0x1043, 0x8269) }, | 45 | { OXYGEN_PCI_SUBID(0x1043, 0x8269) }, |
46 | { OXYGEN_PCI_SUBID(0x1043, 0x8275) }, | 46 | { OXYGEN_PCI_SUBID(0x1043, 0x8275) }, |
47 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7) }, | 47 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7) }, |
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 8d09444ff88b..68a37a7906c1 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c | |||
@@ -102,7 +102,7 @@ enum { | |||
102 | PCI_ID_LAST | 102 | PCI_ID_LAST |
103 | }; | 103 | }; |
104 | 104 | ||
105 | static DEFINE_PCI_DEVICE_TABLE(pcxhr_ids) = { | 105 | static const struct pci_device_id pcxhr_ids[] = { |
106 | { 0x10b5, 0x9656, 0x1369, 0xb001, 0, 0, PCI_ID_VX882HR, }, | 106 | { 0x10b5, 0x9656, 0x1369, 0xb001, 0, 0, PCI_ID_VX882HR, }, |
107 | { 0x10b5, 0x9656, 0x1369, 0xb101, 0, 0, PCI_ID_PCX882HR, }, | 107 | { 0x10b5, 0x9656, 0x1369, 0xb101, 0, 0, PCI_ID_PCX882HR, }, |
108 | { 0x10b5, 0x9656, 0x1369, 0xb201, 0, 0, PCI_ID_VX881HR, }, | 108 | { 0x10b5, 0x9656, 0x1369, 0xb201, 0, 0, PCI_ID_VX881HR, }, |
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index f0315c3f7de4..6abc2ac8fffb 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
@@ -508,7 +508,7 @@ static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip); | |||
508 | /* | 508 | /* |
509 | */ | 509 | */ |
510 | 510 | ||
511 | static DEFINE_PCI_DEVICE_TABLE(snd_riptide_ids) = { | 511 | static const struct pci_device_id snd_riptide_ids[] = { |
512 | { PCI_DEVICE(0x127a, 0x4310) }, | 512 | { PCI_DEVICE(0x127a, 0x4310) }, |
513 | { PCI_DEVICE(0x127a, 0x4320) }, | 513 | { PCI_DEVICE(0x127a, 0x4320) }, |
514 | { PCI_DEVICE(0x127a, 0x4330) }, | 514 | { PCI_DEVICE(0x127a, 0x4330) }, |
@@ -517,7 +517,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_riptide_ids) = { | |||
517 | }; | 517 | }; |
518 | 518 | ||
519 | #ifdef SUPPORT_JOYSTICK | 519 | #ifdef SUPPORT_JOYSTICK |
520 | static DEFINE_PCI_DEVICE_TABLE(snd_riptide_joystick_ids) = { | 520 | static const struct pci_device_id snd_riptide_joystick_ids[] = { |
521 | { PCI_DEVICE(0x127a, 0x4312) }, | 521 | { PCI_DEVICE(0x127a, 0x4312) }, |
522 | { PCI_DEVICE(0x127a, 0x4322) }, | 522 | { PCI_DEVICE(0x127a, 0x4322) }, |
523 | { PCI_DEVICE(0x127a, 0x4332) }, | 523 | { PCI_DEVICE(0x127a, 0x4332) }, |
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c index cc2f0c1b6484..4afd3cab775b 100644 --- a/sound/pci/rme32.c +++ b/sound/pci/rme32.c | |||
@@ -226,7 +226,7 @@ struct rme32 { | |||
226 | struct snd_kcontrol *spdif_ctl; | 226 | struct snd_kcontrol *spdif_ctl; |
227 | }; | 227 | }; |
228 | 228 | ||
229 | static DEFINE_PCI_DEVICE_TABLE(snd_rme32_ids) = { | 229 | static const struct pci_device_id snd_rme32_ids[] = { |
230 | {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32), 0,}, | 230 | {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32), 0,}, |
231 | {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8), 0,}, | 231 | {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8), 0,}, |
232 | {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_PRO), 0,}, | 232 | {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_PRO), 0,}, |
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index 76169929770d..5a395c87c6fc 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
@@ -263,7 +263,7 @@ struct rme96 { | |||
263 | struct snd_kcontrol *spdif_ctl; | 263 | struct snd_kcontrol *spdif_ctl; |
264 | }; | 264 | }; |
265 | 265 | ||
266 | static DEFINE_PCI_DEVICE_TABLE(snd_rme96_ids) = { | 266 | static const struct pci_device_id snd_rme96_ids[] = { |
267 | { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96), 0, }, | 267 | { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96), 0, }, |
268 | { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8), 0, }, | 268 | { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8), 0, }, |
269 | { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PRO), 0, }, | 269 | { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PRO), 0, }, |
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 4c6f5d1c9882..7646ba1664eb 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
@@ -597,7 +597,7 @@ static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_d | |||
597 | } | 597 | } |
598 | 598 | ||
599 | 599 | ||
600 | static DEFINE_PCI_DEVICE_TABLE(snd_hdsp_ids) = { | 600 | static const struct pci_device_id snd_hdsp_ids[] = { |
601 | { | 601 | { |
602 | .vendor = PCI_VENDOR_ID_XILINX, | 602 | .vendor = PCI_VENDOR_ID_XILINX, |
603 | .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP, | 603 | .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP, |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index cb82b593473a..52d86af3ef2d 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
@@ -1077,7 +1077,7 @@ struct hdspm { | |||
1077 | }; | 1077 | }; |
1078 | 1078 | ||
1079 | 1079 | ||
1080 | static DEFINE_PCI_DEVICE_TABLE(snd_hdspm_ids) = { | 1080 | static const struct pci_device_id snd_hdspm_ids[] = { |
1081 | { | 1081 | { |
1082 | .vendor = PCI_VENDOR_ID_XILINX, | 1082 | .vendor = PCI_VENDOR_ID_XILINX, |
1083 | .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI, | 1083 | .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI, |
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index 1d9be90f7748..fa9a2a8dce5a 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c | |||
@@ -307,7 +307,7 @@ static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_d | |||
307 | } | 307 | } |
308 | 308 | ||
309 | 309 | ||
310 | static DEFINE_PCI_DEVICE_TABLE(snd_rme9652_ids) = { | 310 | static const struct pci_device_id snd_rme9652_ids[] = { |
311 | { | 311 | { |
312 | .vendor = 0x10ee, | 312 | .vendor = 0x10ee, |
313 | .device = 0x3fc4, | 313 | .device = 0x3fc4, |
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 6b26b93e001d..7f6a0a0d115a 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c | |||
@@ -52,7 +52,7 @@ MODULE_PARM_DESC(enable, "Enable SiS7019 Audio Accelerator."); | |||
52 | module_param(codecs, int, 0444); | 52 | module_param(codecs, int, 0444); |
53 | MODULE_PARM_DESC(codecs, "Set bit to indicate that codec number is expected to be present (default 1)"); | 53 | MODULE_PARM_DESC(codecs, "Set bit to indicate that codec number is expected to be present (default 1)"); |
54 | 54 | ||
55 | static DEFINE_PCI_DEVICE_TABLE(snd_sis7019_ids) = { | 55 | static const struct pci_device_id snd_sis7019_ids[] = { |
56 | { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x7019) }, | 56 | { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x7019) }, |
57 | { 0, } | 57 | { 0, } |
58 | }; | 58 | }; |
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index 2044dc742071..5b0d317cc9a6 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
@@ -242,7 +242,7 @@ struct sonicvibes { | |||
242 | #endif | 242 | #endif |
243 | }; | 243 | }; |
244 | 244 | ||
245 | static DEFINE_PCI_DEVICE_TABLE(snd_sonic_ids) = { | 245 | static const struct pci_device_id snd_sonic_ids[] = { |
246 | { PCI_VDEVICE(S3, 0xca00), 0, }, | 246 | { PCI_VDEVICE(S3, 0xca00), 0, }, |
247 | { 0, } | 247 | { 0, } |
248 | }; | 248 | }; |
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index d852458caf38..a54cd6879b31 100644 --- a/sound/pci/trident/trident.c +++ b/sound/pci/trident/trident.c | |||
@@ -62,7 +62,7 @@ MODULE_PARM_DESC(pcm_channels, "Number of hardware channels assigned for PCM."); | |||
62 | module_param_array(wavetable_size, int, NULL, 0444); | 62 | module_param_array(wavetable_size, int, NULL, 0444); |
63 | MODULE_PARM_DESC(wavetable_size, "Maximum memory size in kB for wavetable synth."); | 63 | MODULE_PARM_DESC(wavetable_size, "Maximum memory size in kB for wavetable synth."); |
64 | 64 | ||
65 | static DEFINE_PCI_DEVICE_TABLE(snd_trident_ids) = { | 65 | static const struct pci_device_id snd_trident_ids[] = { |
66 | {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX), | 66 | {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX), |
67 | PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0}, | 67 | PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0}, |
68 | {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX), | 68 | {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX), |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 95b98f537b67..ecedf4dbfa2a 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -404,7 +404,7 @@ struct via82xx { | |||
404 | #endif | 404 | #endif |
405 | }; | 405 | }; |
406 | 406 | ||
407 | static DEFINE_PCI_DEVICE_TABLE(snd_via82xx_ids) = { | 407 | static const struct pci_device_id snd_via82xx_ids[] = { |
408 | /* 0x1106, 0x3058 */ | 408 | /* 0x1106, 0x3058 */ |
409 | { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686_5), TYPE_CARD_VIA686, }, /* 686A */ | 409 | { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686_5), TYPE_CARD_VIA686, }, /* 686A */ |
410 | /* 0x1106, 0x3059 */ | 410 | /* 0x1106, 0x3059 */ |
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 46a0526b1d79..fd46ffe12e4f 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c | |||
@@ -260,7 +260,7 @@ struct via82xx_modem { | |||
260 | struct snd_info_entry *proc_entry; | 260 | struct snd_info_entry *proc_entry; |
261 | }; | 261 | }; |
262 | 262 | ||
263 | static DEFINE_PCI_DEVICE_TABLE(snd_via82xx_modem_ids) = { | 263 | static const struct pci_device_id snd_via82xx_modem_ids[] = { |
264 | { PCI_VDEVICE(VIA, 0x3068), TYPE_CARD_VIA82XX_MODEM, }, | 264 | { PCI_VDEVICE(VIA, 0x3068), TYPE_CARD_VIA82XX_MODEM, }, |
265 | { 0, } | 265 | { 0, } |
266 | }; | 266 | }; |
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c index ff9074d22607..3dc4732142ee 100644 --- a/sound/pci/vx222/vx222.c +++ b/sound/pci/vx222/vx222.c | |||
@@ -60,7 +60,7 @@ enum { | |||
60 | VX_PCI_VX222_NEW | 60 | VX_PCI_VX222_NEW |
61 | }; | 61 | }; |
62 | 62 | ||
63 | static DEFINE_PCI_DEVICE_TABLE(snd_vx222_ids) = { | 63 | static const struct pci_device_id snd_vx222_ids[] = { |
64 | { 0x10b5, 0x9050, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, }, /* PLX */ | 64 | { 0x10b5, 0x9050, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, }, /* PLX */ |
65 | { 0x10b5, 0x9030, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, }, /* PLX */ | 65 | { 0x10b5, 0x9030, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, }, /* PLX */ |
66 | { 0, } | 66 | { 0, } |
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index 82eed164b275..47a192369e8f 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c | |||
@@ -66,7 +66,7 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address"); | |||
66 | module_param_array(rear_switch, bool, NULL, 0444); | 66 | module_param_array(rear_switch, bool, NULL, 0444); |
67 | MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch"); | 67 | MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch"); |
68 | 68 | ||
69 | static DEFINE_PCI_DEVICE_TABLE(snd_ymfpci_ids) = { | 69 | static const struct pci_device_id snd_ymfpci_ids[] = { |
70 | { PCI_VDEVICE(YAMAHA, 0x0004), 0, }, /* YMF724 */ | 70 | { PCI_VDEVICE(YAMAHA, 0x0004), 0, }, /* YMF724 */ |
71 | { PCI_VDEVICE(YAMAHA, 0x000d), 0, }, /* YMF724F */ | 71 | { PCI_VDEVICE(YAMAHA, 0x000d), 0, }, /* YMF724F */ |
72 | { PCI_VDEVICE(YAMAHA, 0x000a), 0, }, /* YMF740 */ | 72 | { PCI_VDEVICE(YAMAHA, 0x000a), 0, }, /* YMF740 */ |