Replace DEFINE_PCI_DEVICE_TABLE macro use
Subsystems (91)
cover Replace DEFINE_PCI_DEVICE_TABLE macro use
We should prefer const 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>
I previously sent parts of this patch to check wether or not it was worth sending, and Bjorn answered:
Quoted 4 lines
Benoit, how about if you wait until about half-way through the merge window after v3.16 releases, generate an up-to-date single patch, and post that? Then we can try to get it in before v3.17-rc1 to minimize merge hassles.
So here it is, based on linux-next on 2014-08-07.
PATCH 1/1 Replace 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.
Signed-off-by Benoit Taine <[email protected]>
---
Tested by compilation without errors except:
- drivers/net/ethernet/pasemi/pasemi_mac.c
- drivers/net/ethernet/sgi/ioc3-eth.c
- drivers/net/ethernet/toshiba/spider_net.c
- drivers/net/irda/donauboe.c
- drivers/net/wireless/airo.c
- drivers/net/wireless/ath/ath9k/pci.c
- drivers/net/wireless/ipw2x00/ipw2100.c
- drivers/net/wireless/ipw2x00/ipw2200.c
- drivers/net/wireless/iwlegacy/3945.c
- drivers/net/wireless/iwlegacy/4965-mac.c
- drivers/net/wireless/iwlwifi/pcie/drv.c
- drivers/xen/xen-pciback/pci_stub.c
arch/x86/kernel/cpu/perf_event_intel_uncore.c +5 -5
@@ -945,7 +945,7 @@ static struct intel_uncore_type *snbep_pci_uncores[] = { NULL, }; -static DEFINE_PCI_DEVICE_TABLE (snbep_uncore_pci_ids) = { +static const struct pci_device_id snbep_uncore_pci_ids[] = { {/* Home Agent */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_UNC_HA ), .driver_data =UNCORE_PCI_DEV_DATA (SNBEP_PCI_UNCORE_HA ,0 ),
@@ -1510,7 +1510,7 @@ static struct intel_uncore_type *ivt_pci_uncores[] = { NULL, }; -static DEFINE_PCI_DEVICE_TABLE (ivt_uncore_pci_ids) = { +static const struct pci_device_id ivt_uncore_pci_ids[] = { {/* Home Agent 0 */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0xe30 ), .driver_data =UNCORE_PCI_DEV_DATA (IVT_PCI_UNCORE_HA ,0 ),
@@ -1985,7 +1985,7 @@ static struct intel_uncore_type *snb_pci_uncores[] = { NULL, }; -static DEFINE_PCI_DEVICE_TABLE (snb_uncore_pci_ids) = { +static const struct pci_device_id snb_uncore_pci_ids[] = { {/* IMC */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SNB_IMC ), .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ),
@@ -1993,7 +1993,7 @@ static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = { { /* end: all zeroes */ }, }; -static DEFINE_PCI_DEVICE_TABLE (ivb_uncore_pci_ids) = { +static const struct pci_device_id ivb_uncore_pci_ids[] = { {/* IMC */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_IVB_IMC ), .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ),
@@ -2001,7 +2001,7 @@ static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = { { /* end: all zeroes */ }, }; -static DEFINE_PCI_DEVICE_TABLE (hsw_uncore_pci_ids) = { +static const struct pci_device_id hsw_uncore_pci_ids[] = { {/* IMC */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_HSW_IMC ), .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ),
arch/x86/kernel/iosf_mbi.c +1 -1
@@ -202,7 +202,7 @@ static int iosf_mbi_probe(struct pci_dev *pdev,return 0 ; } -static DEFINE_PCI_DEVICE_TABLE (iosf_mbi_pci_ids) = { +static const struct pci_device_id iosf_mbi_pci_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_BAYTRAIL ) }, {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_QUARK_X1000 ) }, {0 , },
drivers/block/mtip32xx/mtip32xx.c +1 -1
@@ -4632,7 +4632,7 @@ static void mtip_pci_shutdown(struct pci_dev *pdev) }/* Table of device ids supported by this driver. */ -static DEFINE_PCI_DEVICE_TABLE (mtip_pci_tbl) = { +static const struct pci_device_id mtip_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_MICRON ,P320H_DEVICE_ID ) }, {PCI_DEVICE (PCI_VENDOR_ID_MICRON ,P320M_DEVICE_ID ) }, {PCI_DEVICE (PCI_VENDOR_ID_MICRON ,P320S_DEVICE_ID ) },
drivers/block/rsxx/core.c +1 -1
@@ -1137,7 +1137,7 @@ static const struct pci_error_handlers rsxx_err_handler = { .slot_reset = rsxx_slot_reset, }; -static DEFINE_PCI_DEVICE_TABLE (rsxx_pci_ids) = { +static const struct pci_device_id rsxx_pci_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_IBM ,PCI_DEVICE_ID_FS70_FLASH )}, {PCI_DEVICE (PCI_VENDOR_ID_IBM ,PCI_DEVICE_ID_FS80_FLASH )}, {0 ,},
drivers/block/skd_main.c +1 -1
@@ -4766,7 +4766,7 @@ static const struct block_device_operations skd_blockdev_ops = {***************************************************************************** */ -static DEFINE_PCI_DEVICE_TABLE (skd_pci_tbl) = { +static const struct pci_device_id skd_pci_tbl[] = { {PCI_VENDOR_ID_STEC ,PCI_DEVICE_ID_S1120 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , }, {0 }/* terminate list */
drivers/crypto/ccp/ccp-pci.c +1 -1
@@ -320,7 +320,7 @@ static int ccp_pci_resume(struct pci_dev *pdev) }#endif -static DEFINE_PCI_DEVICE_TABLE (ccp_pci_table) = { +static const struct pci_device_id ccp_pci_table[] = { {PCI_VDEVICE (AMD ,0x1537 ), },/* Last entry must be zero */ {0 , }
drivers/gpu/drm/ast/ast_drv.c +1 -1
@@ -51,7 +51,7 @@ static struct drm_driver driver; .subdevice = PCI_ANY_ID, \ .driver_data = (unsigned long) info } -static DEFINE_PCI_DEVICE_TABLE (pciidlist) = { +static const struct pci_device_id pciidlist[] = {AST_VGA_DEVICE (PCI_CHIP_AST2000 ,NULL ),AST_VGA_DEVICE (PCI_CHIP_AST2100 ,NULL ),/* AST_VGA_DEVICE(PCI_CHIP_AST1180, NULL), - don't bind to 1180 for now */
drivers/gpu/drm/bochs/bochs_drv.c +1 -1
@@ -177,7 +177,7 @@ static void bochs_pci_remove(struct pci_dev *pdev)drm_put_dev (dev); } -static DEFINE_PCI_DEVICE_TABLE (bochs_pci_tbl) = { +static const struct pci_device_id bochs_pci_tbl[] = { { .vendor =0x1234 , .device =0x1111 ,
drivers/gpu/drm/cirrus/cirrus_drv.c +1 -1
@@ -29,7 +29,7 @@ module_param_named(modeset, cirrus_modeset, int, 0400);static struct drm_driver driver;/* only bind to the cirrus chip in qemu */ -static DEFINE_PCI_DEVICE_TABLE (pciidlist) = { +static const struct pci_device_id pciidlist[] = { {PCI_VENDOR_ID_CIRRUS ,PCI_DEVICE_ID_CIRRUS_5446 ,0x1af4 ,0x1100 ,0 ,0 ,0 }, {0 ,}
drivers/gpu/drm/gma500/oaktrail_hdmi.c +1 -1
@@ -674,7 +674,7 @@ failed_connector:kfree (gma_encoder); } -static DEFINE_PCI_DEVICE_TABLE (hdmi_ids) = { +static const struct pci_device_id hdmi_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x080d ) }, {0 } };
drivers/gpu/drm/gma500/psb_drv.c +1 -1
@@ -54,7 +54,7 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);* PowerVR SGX545 - Cedartrail - Intel GMA 3650, Intel Atom D2550, D2700, * N2800 */ -static DEFINE_PCI_DEVICE_TABLE (pciidlist) = { +static const struct pci_device_id pciidlist[] = { {0x8086 ,0x8108 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &psb_chip_ops }, {0x8086 ,0x8109 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , (long ) &psb_chip_ops }, #if defined(CONFIG_DRM_GMA600)
drivers/gpu/drm/mgag200/mgag200_drv.c +1 -1
@@ -28,7 +28,7 @@ module_param_named(modeset, mgag200_modeset, int, 0400);static struct drm_driver driver; -static DEFINE_PCI_DEVICE_TABLE (pciidlist) = { +static const struct pci_device_id pciidlist[] = { {PCI_VENDOR_ID_MATROX ,0x522 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,G200_SE_A }, {PCI_VENDOR_ID_MATROX ,0x524 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,G200_SE_B }, {PCI_VENDOR_ID_MATROX ,0x530 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,G200_EV },
drivers/gpu/drm/qxl/qxl_drv.c +1 -1
@@ -38,7 +38,7 @@#include "qxl_object.h" extern int qxl_max_ioctls; -static DEFINE_PCI_DEVICE_TABLE (pciidlist) = { +static const struct pci_device_id pciidlist[] = { {0x1b36 ,0x100 ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_CLASS_DISPLAY_VGA <<8 ,0xffff00 ,0 }, {0x1b36 ,0x100 ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_CLASS_DISPLAY_OTHER <<8 ,
drivers/infiniband/hw/qib/qib_init.c +1 -1
@@ -1222,7 +1222,7 @@ static int qib_init_one(struct pci_dev *, const struct pci_device_id *);#define DRIVER_LOAD_MSG "Intel " QIB_DRV_NAME " loaded: "#define PFX QIB_DRV_NAME ": " -static DEFINE_PCI_DEVICE_TABLE (qib_pci_tbl) = { +static const struct pci_device_id qib_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_PATHSCALE ,PCI_DEVICE_ID_QLOGIC_IB_6120 ) }, {PCI_DEVICE (PCI_VENDOR_ID_QLOGIC ,PCI_DEVICE_ID_QLOGIC_IB_7220 ) }, {PCI_DEVICE (PCI_VENDOR_ID_QLOGIC ,PCI_DEVICE_ID_QLOGIC_IB_7322 ) },
drivers/infiniband/hw/usnic/usnic_ib_main.c +1 -1
@@ -490,7 +490,7 @@ out:/* Start of PCI section */ -static DEFINE_PCI_DEVICE_TABLE (usnic_ib_pci_ids) = { +static const struct pci_device_id usnic_ib_pci_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_CISCO ,PCI_DEVICE_ID_CISCO_VIC_USPACE_NIC )}, {0 ,} };
drivers/mmc/host/dw_mmc-pci.c +1 -1
@@ -102,7 +102,7 @@ static int dw_mci_pci_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(dw_mci_pci_pmops, dw_mci_pci_suspend, dw_mci_pci_resume); -static DEFINE_PCI_DEVICE_TABLE (dw_mci_pci_id) = { +static const struct pci_device_id dw_mci_pci_id[] = { {PCI_DEVICE (SYNOPSYS_DW_MCI_VENDOR_ID ,SYNOPSYS_DW_MCI_DEVICE_ID ) }, {} };
drivers/net/arcnet/com20020-pci.c +1 -1
@@ -144,7 +144,7 @@ static void com20020pci_remove(struct pci_dev *pdev)free_netdev (dev); } -static DEFINE_PCI_DEVICE_TABLE (com20020pci_id_table) = { +static const struct pci_device_id com20020pci_id_table[] = { {0x1571 ,0xa001 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {0x1571 ,0xa002 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {0x1571 ,0xa003 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },
drivers/net/can/c_can/c_can_pci.c +2 -1
@@ -270,7 +270,8 @@ static struct c_can_pci_data c_can_pch = { PCI_DEVICE(_vend, _dev), \ .driver_data = (unsigned long)&_driverdata, \ } -static DEFINE_PCI_DEVICE_TABLE (c_can_pci_tbl) = { + +static const struct pci_device_id c_can_pci_tbl[] = {C_CAN_ID (PCI_VENDOR_ID_STMICRO ,PCI_DEVICE_ID_STMICRO_CAN , c_can_sta2x11), C_CAN_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PCH_CAN,
drivers/net/can/pch_can.c +1 -1
@@ -194,7 +194,7 @@ static const struct can_bittiming_const pch_can_bittiming_const = { .brp_inc = 1, }; -static DEFINE_PCI_DEVICE_TABLE (pch_pci_tbl) = { +static const struct pci_device_id pch_pci_tbl[] = { {PCI_VENDOR_ID_INTEL ,0x8818 ,PCI_ANY_ID ,PCI_ANY_ID ,}, {0 ,} };
drivers/net/can/sja1000/ems_pci.c +1 -1
@@ -101,7 +101,7 @@ struct ems_pci_card {#define EMS_PCI_BASE_SIZE 4096/* size of controller area */ -static DEFINE_PCI_DEVICE_TABLE (ems_pci_tbl) = { +static const struct pci_device_id ems_pci_tbl[] = {/* CPC-PCI v1 */ {PCI_VENDOR_ID_SIEMENS ,0x2104 ,PCI_ANY_ID ,PCI_ANY_ID ,},/* CPC-PCI v2 */
drivers/net/can/sja1000/kvaser_pci.c +1 -1
@@ -107,7 +107,7 @@ struct kvaser_pci {#define KVASER_PCI_VENDOR_ID2 0x1a07/* the PCI device and vendor IDs */ #define KVASER_PCI_DEVICE_ID2 0x0008 -static DEFINE_PCI_DEVICE_TABLE (kvaser_pci_tbl) = { +static const struct pci_device_id kvaser_pci_tbl[] = { {KVASER_PCI_VENDOR_ID1 ,KVASER_PCI_DEVICE_ID1 ,PCI_ANY_ID ,PCI_ANY_ID ,}, {KVASER_PCI_VENDOR_ID2 ,KVASER_PCI_DEVICE_ID2 ,PCI_ANY_ID ,PCI_ANY_ID ,}, {0 ,}
drivers/net/can/sja1000/peak_pci.c +1 -1
@@ -77,7 +77,7 @@ static const u16 peak_pci_icr_masks[PEAK_PCI_CHAN_MAX] = {0x02 ,0x01 ,0x40 ,0x80 }; -static DEFINE_PCI_DEVICE_TABLE (peak_pci_tbl) = { +static const struct pci_device_id peak_pci_tbl[] = { {PEAK_PCI_VENDOR_ID ,PEAK_PCI_DEVICE_ID ,PCI_ANY_ID ,PCI_ANY_ID ,}, {PEAK_PCI_VENDOR_ID ,PEAK_PCIE_DEVICE_ID ,PCI_ANY_ID ,PCI_ANY_ID ,}, {PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
drivers/net/can/sja1000/plx_pci.c +1 -1
@@ -247,7 +247,7 @@ static struct plx_pci_card_info plx_pci_card_info_elcus = {/* based on PLX9030 */ }; -static DEFINE_PCI_DEVICE_TABLE (plx_pci_tbl) = { +static const struct pci_device_id plx_pci_tbl[] = { {/* Adlink PCI-7841/cPCI-7841 */ ADLINK_PCI_VENDOR_ID ,ADLINK_PCI_DEVICE_ID ,
drivers/net/ethernet/3com/3c59x.c +1 -1
@@ -375,7 +375,7 @@ static struct vortex_chip_info { }; -static DEFINE_PCI_DEVICE_TABLE (vortex_pci_tbl) = { +static const struct pci_device_id vortex_pci_tbl[] = { {0x10B7 ,0x5900 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,CH_3C590 }, {0x10B7 ,0x5920 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,CH_3C592 }, {0x10B7 ,0x5970 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,CH_3C597 },
drivers/net/ethernet/3com/typhoon.c +1 -1
@@ -203,7 +203,7 @@ static struct typhoon_card_info typhoon_card_info[] = {* bit 8 indicates if this is a (0) copper or (1) fiber card * bits 12-16 indicate card type: (0) client and (1) server */ -static DEFINE_PCI_DEVICE_TABLE (typhoon_pci_tbl) = { +static const struct pci_device_id typhoon_pci_tbl[] = { {PCI_VENDOR_ID_3COM ,PCI_DEVICE_ID_3COM_3CR990 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,TYPHOON_TX }, {PCI_VENDOR_ID_3COM ,PCI_DEVICE_ID_3COM_3CR990_TX_95 ,
drivers/net/ethernet/8390/ne2k-pci.c +1 -1
@@ -135,7 +135,7 @@ static struct { }; -static DEFINE_PCI_DEVICE_TABLE (ne2k_pci_tbl) = { +static const struct pci_device_id ne2k_pci_tbl[] = { {0x10ec ,0x8029 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , CH_RealTek_RTL_8029 }, {0x1050 ,0x0940 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , CH_Winbond_89C940 }, {0x11f6 ,0x1401 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , CH_Compex_RL2000 },
drivers/net/ethernet/adaptec/starfire.c +1 -1
@@ -285,7 +285,7 @@ enum chipset { CH_6915 = 0, }; -static DEFINE_PCI_DEVICE_TABLE (starfire_pci_tbl) = { +static const struct pci_device_id starfire_pci_tbl[] = { {PCI_VDEVICE (ADAPTEC ,0x6915 ),CH_6915 }, {0 , } };
drivers/net/ethernet/alteon/acenic.c +1 -1
@@ -131,7 +131,7 @@#define PCI_DEVICE_ID_SGI_ACENIC 0x0009#endif -static DEFINE_PCI_DEVICE_TABLE (acenic_pci_tbl) = { +static const struct pci_device_id acenic_pci_tbl[] = { {PCI_VENDOR_ID_ALTEON ,PCI_DEVICE_ID_ALTEON_ACENIC_FIBRE ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_CLASS_NETWORK_ETHERNET <<8 ,0xffff00 , }, {PCI_VENDOR_ID_ALTEON ,PCI_DEVICE_ID_ALTEON_ACENIC_COPPER ,
drivers/net/ethernet/amd/pcnet32.c +1 -1
@@ -61,7 +61,7 @@ static const char *const version =/* * PCI device identifiers for "new style" Linux PCI Device Drivers */ -static DEFINE_PCI_DEVICE_TABLE (pcnet32_pci_tbl) = { +static const struct pci_device_id pcnet32_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_LANCE_HOME ), }, {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_LANCE ), },
drivers/net/ethernet/atheros/alx/main.c +1 -1
@@ -1527,7 +1527,7 @@ static const struct pci_error_handlers alx_err_handlers = { .resume = alx_pci_error_resume, }; -static DEFINE_PCI_DEVICE_TABLE (alx_pci_tbl) = { +static const struct pci_device_id alx_pci_tbl[] = { {PCI_VDEVICE (ATTANSIC ,ALX_DEV_ID_AR8161 ), .driver_data =ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG }, {PCI_VDEVICE (ATTANSIC ,ALX_DEV_ID_E2200 ),
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1 -1
@@ -34,7 +34,7 @@ char atl1c_driver_version[] = ATL1C_DRV_VERSION;* { Vendor ID, Device ID, SubVendor ID, SubDevice ID, * Class, Class Mask, private data (not used) } */ -static DEFINE_PCI_DEVICE_TABLE (atl1c_pci_tbl) = { +static const struct pci_device_id atl1c_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_ATTANSIC ,PCI_DEVICE_ID_ATTANSIC_L1C )}, {PCI_DEVICE (PCI_VENDOR_ID_ATTANSIC ,PCI_DEVICE_ID_ATTANSIC_L2C )}, {PCI_DEVICE (PCI_VENDOR_ID_ATTANSIC ,PCI_DEVICE_ID_ATHEROS_L2C_B )},
drivers/net/ethernet/atheros/atl1e/atl1e_main.c +1 -1
@@ -35,7 +35,7 @@ char atl1e_driver_version[] = DRV_VERSION;* { Vendor ID, Device ID, SubVendor ID, SubDevice ID, * Class, Class Mask, private data (not used) } */ -static DEFINE_PCI_DEVICE_TABLE (atl1e_pci_tbl) = { +static const struct pci_device_id atl1e_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_ATTANSIC ,PCI_DEVICE_ID_ATTANSIC_L1E )}, {PCI_DEVICE (PCI_VENDOR_ID_ATTANSIC ,0x1066 )},/* required last entry */
drivers/net/ethernet/atheros/atlx/atl1.c +1 -1
@@ -235,7 +235,7 @@ static void atl1_check_options(struct atl1_adapter *adapter)/* * atl1_pci_tbl - PCI Device ID Table */ -static DEFINE_PCI_DEVICE_TABLE (atl1_pci_tbl) = { +static const struct pci_device_id atl1_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_ATTANSIC ,PCI_DEVICE_ID_ATTANSIC_L1 )},/* required last entry */ {0 ,}
drivers/net/ethernet/atheros/atlx/atl2.c +1 -1
@@ -65,7 +65,7 @@ MODULE_VERSION(ATL2_DRV_VERSION);/* * atl2_pci_tbl - PCI Device ID Table */ -static DEFINE_PCI_DEVICE_TABLE (atl2_pci_tbl) = { +static const struct pci_device_id atl2_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_ATTANSIC ,PCI_DEVICE_ID_ATTANSIC_L2 )},/* required last entry */ {0 ,}
drivers/net/ethernet/broadcom/b44.c +1 -1
@@ -105,7 +105,7 @@ MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");#ifdef CONFIG_B44_PCI -static DEFINE_PCI_DEVICE_TABLE (b44_pci_tbl) = { +static const struct pci_device_id b44_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_BROADCOM ,PCI_DEVICE_ID_BCM4401 ) }, {PCI_DEVICE (PCI_VENDOR_ID_BROADCOM ,PCI_DEVICE_ID_BCM4401B0 ) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1) },
drivers/net/ethernet/broadcom/bnx2.c +1 -1
@@ -120,7 +120,7 @@ static struct { { "Broadcom NetXtreme II BCM5716 1000Base-SX" }, }; -static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = { +static const struct pci_device_id bnx2_pci_tbl[] = { { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706, PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -1
@@ -249,7 +249,7 @@ static struct {#define PCI_DEVICE_ID_NX2_57811_VF CHIP_NUM_57811_VF#endif -static DEFINE_PCI_DEVICE_TABLE (bnx2x_pci_tbl) = { +static const struct pci_device_id bnx2x_pci_tbl[] = { {PCI_VDEVICE (BROADCOM ,PCI_DEVICE_ID_NX2_57710 ),BCM57710 }, {PCI_VDEVICE (BROADCOM ,PCI_DEVICE_ID_NX2_57711 ),BCM57711 }, {PCI_VDEVICE (BROADCOM ,PCI_DEVICE_ID_NX2_57711E ),BCM57711E },
drivers/net/ethernet/broadcom/tg3.c +3 -3
@@ -237,7 +237,7 @@ MODULE_PARM_DESC(tg3_debug, "Tigon3 bitmapped debugging message enable value");#define TG3_DRV_DATA_FLAG_10_100_ONLY 0x0001#define TG3_DRV_DATA_FLAG_5705_10_100 0x0002 -static DEFINE_PCI_DEVICE_TABLE (tg3_pci_tbl) = { +static const struct pci_device_id tg3_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_BROADCOM ,PCI_DEVICE_ID_TIGON3_5700 )}, {PCI_DEVICE (PCI_VENDOR_ID_BROADCOM ,PCI_DEVICE_ID_TIGON3_5701 )}, {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)return TG3_RX_RET_MAX_SIZE_5705 ; } -static DEFINE_PCI_DEVICE_TABLE (tg3_write_reorder_chipsets) = { +static const struct pci_device_id tg3_write_reorder_chipsets[] = { {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_FE_GATE_700C ) }, {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_8131_BRIDGE ) }, {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,#define TEST_BUFFER_SIZE 0x2000 -static DEFINE_PCI_DEVICE_TABLE (tg3_dma_wait_state_chipsets) = { +static const struct pci_device_id tg3_dma_wait_state_chipsets[] = { {PCI_DEVICE (PCI_VENDOR_ID_APPLE ,PCI_DEVICE_ID_APPLE_UNI_N_PCI15 ) }, { }, };
drivers/net/ethernet/brocade/bna/bnad.c +1 -1
@@ -3836,7 +3836,7 @@ bnad_pci_remove(struct pci_dev *pdev)free_netdev (netdev); } -static DEFINE_PCI_DEVICE_TABLE (bnad_pci_id_table) = { +static const struct pci_device_id bnad_pci_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_BROCADE ,PCI_DEVICE_ID_BROCADE_CT ),
drivers/net/ethernet/chelsio/cxgb/subr.c +1 -1
@@ -522,7 +522,7 @@ static const struct board_info t1_board[] = { }; -DEFINE_PCI_DEVICE_TABLE (t1_pci_tbl) = { +const struct pci_device_id t1_pci_tbl[] = {CH_DEVICE (8 ,0 ,CH_BRD_T110_1CU ),CH_DEVICE (8 ,1 ,CH_BRD_T110_1CU ),CH_DEVICE (7 ,0 ,CH_BRD_N110_1F ),
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +1 -1
@@ -85,7 +85,7 @@ enum {#define CH_DEVICE (devid, idx) \ { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx } -static DEFINE_PCI_DEVICE_TABLE (cxgb3_pci_tbl) = { +static const struct pci_device_id cxgb3_pci_tbl[] = {CH_DEVICE (0x20 ,0 ),/* PE9000 */ CH_DEVICE (0x21 ,1 ),/* T302E */ CH_DEVICE (0x22 ,2 ),/* T310E */
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -1
@@ -212,7 +212,7 @@ struct filter_entry {#define CH_DEVICE (devid, data) { PCI_VDEVICE(CHELSIO, devid), (data) } -static DEFINE_PCI_DEVICE_TABLE (cxgb4_pci_tbl) = { +static const struct pci_device_id cxgb4_pci_tbl[] = {CH_DEVICE (0xa000 ,0 ),/* PE10K */ CH_DEVICE (0x4001 ,-1 ),CH_DEVICE (0x4002 ,-1 ),
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +1 -1
@@ -2910,7 +2910,7 @@ static void cxgb4vf_pci_shutdown(struct pci_dev *pdev)#define CH_DEVICE (devid, idx) \ { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx } -static DEFINE_PCI_DEVICE_TABLE (cxgb4vf_pci_tbl) = { +static const struct pci_device_id cxgb4vf_pci_tbl[] = {CH_DEVICE (0xb000 ,0 ),/* PE10K FPGA */ CH_DEVICE (0x4800 ,0 ),/* T440-dbg */ CH_DEVICE (0x4801 ,0 ),/* T420-cr */
drivers/net/ethernet/cisco/enic/enic_main.c +1 -1
@@ -67,7 +67,7 @@#define PCI_DEVICE_ID_CISCO_VIC_ENET_VF 0x0071/* enet SRIOV VF */ /* Supported devices */ -static DEFINE_PCI_DEVICE_TABLE (enic_id_table) = { +static const struct pci_device_id enic_id_table[] = { {PCI_VDEVICE (CISCO ,PCI_DEVICE_ID_CISCO_VIC_ENET ) }, {PCI_VDEVICE (CISCO ,PCI_DEVICE_ID_CISCO_VIC_ENET_DYN ) }, {PCI_VDEVICE (CISCO ,PCI_DEVICE_ID_CISCO_VIC_ENET_VF ) },
drivers/net/ethernet/dec/tulip/de2104x.c +1 -1
@@ -340,7 +340,7 @@ static void de21041_media_timer (unsigned long data);static unsigned int de_ok_to_advertise (struct de_private *de,u32 new_media); -static DEFINE_PCI_DEVICE_TABLE (de_pci_tbl) = { +static const struct pci_device_id de_pci_tbl[] = { {PCI_VENDOR_ID_DEC ,PCI_DEVICE_ID_DEC_TULIP ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {PCI_VENDOR_ID_DEC ,PCI_DEVICE_ID_DEC_TULIP_PLUS ,
drivers/net/ethernet/dec/tulip/de4x5.c +1 -1
@@ -2328,7 +2328,7 @@ static void de4x5_pci_remove(struct pci_dev *pdev)pci_disable_device (pdev); } -static DEFINE_PCI_DEVICE_TABLE (de4x5_pci_tbl) = { +static const struct pci_device_id de4x5_pci_tbl[] = { {PCI_VENDOR_ID_DEC ,PCI_DEVICE_ID_DEC_TULIP ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {PCI_VENDOR_ID_DEC ,PCI_DEVICE_ID_DEC_TULIP_PLUS ,
drivers/net/ethernet/dec/tulip/dmfe.c +1 -1
@@ -2096,7 +2096,7 @@ static void dmfe_HPNA_remote_cmd_chk(struct dmfe_board_info * db) -static DEFINE_PCI_DEVICE_TABLE (dmfe_pci_tbl) = { +static const struct pci_device_id dmfe_pci_tbl[] = { {0x1282 ,0x9132 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PCI_DM9132_ID }, {0x1282 ,0x9102 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PCI_DM9102_ID }, {0x1282 ,0x9100 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PCI_DM9100_ID },
drivers/net/ethernet/dec/tulip/tulip_core.c +2 -2
@@ -207,7 +207,7 @@ struct tulip_chip_table tulip_tbl[] = { }; -static DEFINE_PCI_DEVICE_TABLE (tulip_pci_tbl) = { +static const struct pci_device_id tulip_pci_tbl[] = { {0x1011 ,0x0009 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DC21140 }, {0x1011 ,0x0019 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DC21143 }, {0x11AD ,0x0002 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,LC82C168 },
@@ -1294,7 +1294,7 @@ static const struct net_device_ops tulip_netdev_ops = {#endif }; -DEFINE_PCI_DEVICE_TABLE (early_486_chipsets) = { +const struct pci_device_id early_486_chipsets[] = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82424 ) }, {PCI_DEVICE (PCI_VENDOR_ID_SI ,PCI_DEVICE_ID_SI_496 ) }, { },
drivers/net/ethernet/dec/tulip/uli526x.c +1 -1
@@ -1768,7 +1768,7 @@ static u16 phy_read_1bit(struct uli526x_board_info *db) } -static DEFINE_PCI_DEVICE_TABLE (uli526x_pci_tbl) = { +static const struct pci_device_id uli526x_pci_tbl[] = { {0x10B9 ,0x5261 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PCI_ULI5261_ID }, {0x10B9 ,0x5263 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,PCI_ULI5263_ID }, {0 , }
drivers/net/ethernet/dec/tulip/winbond-840.c +1 -1
@@ -219,7 +219,7 @@ enum chip_capability_flags { CanHaveMII=1, HasBrokenTx=2, AlwaysFDX=4, FDXOnNoMII=8, }; -static DEFINE_PCI_DEVICE_TABLE (w840_pci_tbl) = { +static const struct pci_device_id w840_pci_tbl[] = { {0x1050 ,0x0840 ,PCI_ANY_ID ,0x8153 ,0 ,0 ,0 }, {0x1050 ,0x0840 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, {0x11f6 ,0x2011 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,2 },
drivers/net/ethernet/dec/tulip/xircom_cb.c +1 -1
@@ -137,7 +137,7 @@ static int link_status(struct xircom_private *card); -static DEFINE_PCI_DEVICE_TABLE (xircom_pci_table) = { +static const struct pci_device_id xircom_pci_table[] = { {PCI_VDEVICE (XIRCOM ,0x0003 ), }, {0 ,}, };
drivers/net/ethernet/dlink/dl2k.h +1 -1
@@ -408,7 +408,7 @@ struct netdev_private {driver_data Data private to the driver. */ -static DEFINE_PCI_DEVICE_TABLE (rio_pci_tbl) = { +static const struct pci_device_id rio_pci_tbl[] = { {0x1186 ,0x4000 ,PCI_ANY_ID ,PCI_ANY_ID , }, {0x13f0 ,0x1021 ,PCI_ANY_ID ,PCI_ANY_ID , }, { }
drivers/net/ethernet/dlink/sundance.c +1 -1
@@ -199,7 +199,7 @@ IVc. Errata#define USE_IO_OPS 1#endif -static DEFINE_PCI_DEVICE_TABLE (sundance_pci_tbl) = { +static const struct pci_device_id sundance_pci_tbl[] = { {0x1186 ,0x1002 ,0x1186 ,0x1002 ,0 ,0 ,0 }, {0x1186 ,0x1002 ,0x1186 ,0x1003 ,0 ,0 ,1 }, {0x1186 ,0x1002 ,0x1186 ,0x1012 ,0 ,0 ,2 },
drivers/net/ethernet/emulex/benet/be_main.c +1 -1
@@ -39,7 +39,7 @@ static ushort rx_frag_size = 2048;module_param (rx_frag_size, ushort,S_IRUGO );MODULE_PARM_DESC (rx_frag_size,"Size of a fragment that holds rcvd data." ); -static DEFINE_PCI_DEVICE_TABLE (be_dev_ids) = { +static const struct pci_device_id be_dev_ids[] = { {PCI_DEVICE (BE_VENDOR_ID ,BE_DEVICE_ID1 ) }, {PCI_DEVICE (BE_VENDOR_ID ,BE_DEVICE_ID2 ) }, {PCI_DEVICE (BE_VENDOR_ID ,OC_DEVICE_ID1 ) },
drivers/net/ethernet/fealnx.c +1 -1
@@ -1936,7 +1936,7 @@ static int netdev_close(struct net_device *dev)return 0 ; } -static DEFINE_PCI_DEVICE_TABLE (fealnx_pci_tbl) = { +static const struct pci_device_id fealnx_pci_tbl[] = { {0x1516 ,0x0800 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {0x1516 ,0x0803 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, {0x1516 ,0x0891 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,2 },
drivers/net/ethernet/hp/hp100.c +1 -1
@@ -208,7 +208,7 @@ MODULE_DEVICE_TABLE(eisa, hp100_eisa_tbl);#endif #ifdef CONFIG_PCI -static DEFINE_PCI_DEVICE_TABLE (hp100_pci_tbl) = { +static const struct pci_device_id hp100_pci_tbl[] = { {PCI_VENDOR_ID_HP ,PCI_DEVICE_ID_HP_J2585A ,PCI_ANY_ID ,PCI_ANY_ID ,}, {PCI_VENDOR_ID_HP ,PCI_DEVICE_ID_HP_J2585B ,PCI_ANY_ID ,PCI_ANY_ID ,}, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2970A, PCI_ANY_ID, PCI_ANY_ID,},
drivers/net/ethernet/icplus/ipg.c +1 -1
@@ -95,7 +95,7 @@ static const char * const ipg_brand_name[] = {"D-Link NIC IP1000A" }; -static DEFINE_PCI_DEVICE_TABLE (ipg_pci_tbl) = { +static const struct pci_device_id ipg_pci_tbl[] = { {PCI_VDEVICE (SUNDANCE ,0x1023 ),0 }, {PCI_VDEVICE (SUNDANCE ,0x2021 ),1 }, {PCI_VDEVICE (DLINK ,0x9021 ),2 },
drivers/net/ethernet/intel/e100.c +1 -1
@@ -208,7 +208,7 @@ MODULE_PARM_DESC(use_io, "Force use of i/o access mode");#define INTEL_8255X_ETHERNET_DEVICE (device_id, ich) {\ PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \ PCI_CLASS_NETWORK_ETHERNET << 8, 0xFFFF00, ich } -static DEFINE_PCI_DEVICE_TABLE (e100_id_table) = { +static const struct pci_device_id e100_id_table[] = {INTEL_8255X_ETHERNET_DEVICE (0x1029 ,0 ),INTEL_8255X_ETHERNET_DEVICE (0x1030 ,0 ),INTEL_8255X_ETHERNET_DEVICE (0x1031 ,3 ),
drivers/net/ethernet/intel/e1000/e1000_main.c +1 -1
@@ -46,7 +46,7 @@ static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation* Macro expands to... * {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} */ -static DEFINE_PCI_DEVICE_TABLE (e1000_pci_tbl) = { +static const struct pci_device_id e1000_pci_tbl[] = {INTEL_E1000_ETHERNET_DEVICE (0x1000 ),INTEL_E1000_ETHERNET_DEVICE (0x1001 ),INTEL_E1000_ETHERNET_DEVICE (0x1004 ),
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -65,7 +65,7 @@ static int i40e_veb_get_bw_info(struct i40e_veb *veb);* { Vendor ID, Device ID, SubVendor ID, SubDevice ID, * Class, Class Mask, private data (not used) } */ -static DEFINE_PCI_DEVICE_TABLE (i40e_pci_tbl) = { +static const struct pci_device_id i40e_pci_tbl[] = { {PCI_VDEVICE (INTEL ,I40E_DEV_ID_SFP_XL710 ),0 }, {PCI_VDEVICE (INTEL ,I40E_DEV_ID_QEMU ),0 }, {PCI_VDEVICE (INTEL ,I40E_DEV_ID_KX_A ),0 },
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -1
@@ -49,7 +49,7 @@ static const char i40evf_copyright[] =* { Vendor ID, Device ID, SubVendor ID, SubDevice ID, * Class, Class Mask, private data (not used) } */ -static DEFINE_PCI_DEVICE_TABLE (i40evf_pci_tbl) = { +static const struct pci_device_id i40evf_pci_tbl[] = { {PCI_VDEVICE (INTEL ,I40E_DEV_ID_VF ),0 },/* required last entry */ {0 , }
drivers/net/ethernet/intel/igbvf/netdev.c +1 -1
@@ -2853,7 +2853,7 @@ static const struct pci_error_handlers igbvf_err_handler = { .resume = igbvf_io_resume, }; -static DEFINE_PCI_DEVICE_TABLE (igbvf_pci_tbl) = { +static const struct pci_device_id igbvf_pci_tbl[] = { {PCI_VDEVICE (INTEL ,E1000_DEV_ID_82576_VF ), board_vf }, {PCI_VDEVICE (INTEL ,E1000_DEV_ID_I350_VF ), board_i350_vf }, { }/* terminate list */
drivers/net/ethernet/intel/ixgb/ixgb_main.c +1 -1
@@ -53,7 +53,7 @@ MODULE_PARM_DESC(copybreak,* { Vendor ID, Device ID, SubVendor ID, SubDevice ID, * Class, Class Mask, private data (not used) } */ -static DEFINE_PCI_DEVICE_TABLE (ixgb_pci_tbl) = { +static const struct pci_device_id ixgb_pci_tbl[] = { {PCI_VENDOR_ID_INTEL ,IXGB_DEVICE_ID_82597EX ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {PCI_VENDOR_ID_INTEL ,IXGB_DEVICE_ID_82597EX_CX4 ,
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -1
@@ -84,7 +84,7 @@ static const struct ixgbe_info *ixgbe_info_tbl[] = {* { Vendor ID, Device ID, SubVendor ID, SubDevice ID, * Class, Class Mask, private data (not used) } */ -static DEFINE_PCI_DEVICE_TABLE (ixgbe_pci_tbl) = { +static const struct pci_device_id ixgbe_pci_tbl[] = { {PCI_VDEVICE (INTEL ,IXGBE_DEV_ID_82598 ), board_82598 }, {PCI_VDEVICE (INTEL ,IXGBE_DEV_ID_82598AF_DUAL_PORT ), board_82598 }, {PCI_VDEVICE (INTEL ,IXGBE_DEV_ID_82598AF_SINGLE_PORT ), board_82598 },
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1 -1
@@ -76,7 +76,7 @@ static const struct ixgbevf_info *ixgbevf_info_tbl[] = {* { Vendor ID, Device ID, SubVendor ID, SubDevice ID, * Class, Class Mask, private data (not used) } */ -static DEFINE_PCI_DEVICE_TABLE (ixgbevf_pci_tbl) = { +static const struct pci_device_id ixgbevf_pci_tbl[] = { {PCI_VDEVICE (INTEL ,IXGBE_DEV_ID_82599_VF ), board_82599_vf }, {PCI_VDEVICE (INTEL ,IXGBE_DEV_ID_X540_VF ), board_X540_vf },/* required last entry */
drivers/net/ethernet/jme.c +1 -1
@@ -3334,7 +3334,7 @@ static SIMPLE_DEV_PM_OPS(jme_pm_ops, jme_suspend, jme_resume);#define JME_PM_OPS NULL#endif -static DEFINE_PCI_DEVICE_TABLE (jme_pci_tbl) = { +static const struct pci_device_id jme_pci_tbl[] = { {PCI_VDEVICE (JMICRON ,PCI_DEVICE_ID_JMICRON_JMC250 ) }, {PCI_VDEVICE (JMICRON ,PCI_DEVICE_ID_JMICRON_JMC260 ) }, { }
drivers/net/ethernet/marvell/skge.c +1 -1
@@ -82,7 +82,7 @@ static int debug = -1; /* defaults above */module_param (debug, int,0 );MODULE_PARM_DESC (debug,"Debug level (0=none,...,16=all)" ); -static DEFINE_PCI_DEVICE_TABLE (skge_id_table) = { +static const struct pci_device_id skge_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_3COM ,0x1700 ) },/* 3Com 3C940 */ {PCI_DEVICE (PCI_VENDOR_ID_3COM ,0x80EB ) },/* 3Com 3C940B */ #ifdef CONFIG_SKGE_GENESIS
drivers/net/ethernet/marvell/sky2.c +1 -1
@@ -101,7 +101,7 @@ static int legacy_pme = 0;module_param (legacy_pme, int,0 );MODULE_PARM_DESC (legacy_pme,"Legacy power management" ); -static DEFINE_PCI_DEVICE_TABLE (sky2_id_table) = { +static const struct pci_device_id sky2_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_SYSKONNECT ,0x9000 ) },/* SK-9Sxx */ {PCI_DEVICE (PCI_VENDOR_ID_SYSKONNECT ,0x9E00 ) },/* SK-9Exx */ {PCI_DEVICE (PCI_VENDOR_ID_SYSKONNECT ,0x9E01 ) },/* SK-9E21M */
drivers/net/ethernet/mellanox/mlx4/main.c +1 -1
@@ -2732,7 +2732,7 @@ int mlx4_restart_one(struct pci_dev *pdev)return __mlx4_init_one (pdev, pci_dev_data); } -static DEFINE_PCI_DEVICE_TABLE (mlx4_pci_table) = { +static const struct pci_device_id mlx4_pci_table[] = {/* MT25408 "Hermon" SDR */ {PCI_VDEVICE (MELLANOX ,0x6340 ),MLX4_PCI_DEV_FORCE_SENSE_PORT },/* MT25408 "Hermon" DDR */
drivers/net/ethernet/micrel/ksz884x.c +1 -1
@@ -7221,7 +7221,7 @@ static int pcidev_suspend(struct pci_dev *pdev, pm_message_t state)static char pcidev_name[] ="ksz884xp" ; -static DEFINE_PCI_DEVICE_TABLE (pcidev_table) = { +static const struct pci_device_id pcidev_table[] = { {PCI_VENDOR_ID_MICREL_KS ,0x8841 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {PCI_VENDOR_ID_MICREL_KS ,0x8842 ,
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +1 -1
@@ -4213,7 +4213,7 @@ static void myri10ge_remove(struct pci_dev *pdev)#define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E 0x0008#define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9 0x0009 -static DEFINE_PCI_DEVICE_TABLE (myri10ge_pci_tbl) = { +static const struct pci_device_id myri10ge_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_MYRICOM ,PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E )}, {PCI_DEVICE (PCI_VENDOR_ID_MYRICOM ,PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E_9 )},
drivers/net/ethernet/natsemi/natsemi.c +1 -1
@@ -247,7 +247,7 @@ static struct { { "NatSemi DP8381[56]", 0, 24 }, }; -static DEFINE_PCI_DEVICE_TABLE (natsemi_pci_tbl) = { +static const struct pci_device_id natsemi_pci_tbl[] = { {PCI_VENDOR_ID_NS ,0x0020 ,0x12d9 ,0x000c ,0 ,0 ,0 }, {PCI_VENDOR_ID_NS ,0x0020 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, { } /* terminate list */
drivers/net/ethernet/natsemi/ns83820.c +1 -1
@@ -2260,7 +2260,7 @@ static void ns83820_remove_one(struct pci_dev *pci_dev)free_netdev (ndev); } -static DEFINE_PCI_DEVICE_TABLE (ns83820_pci_tbl) = { +static const struct pci_device_id ns83820_pci_tbl[] = { {0x100b ,0x0022 ,PCI_ANY_ID ,PCI_ANY_ID ,0 , .driver_data =0 , }, {0 , }, };
drivers/net/ethernet/neterion/s2io.c +1 -1
@@ -471,7 +471,7 @@ module_param_array(rts_frm_len, uint, NULL, 0);* S2IO device table. * This table lists all the devices that this driver supports. */ -static DEFINE_PCI_DEVICE_TABLE (s2io_tbl) = { +static const struct pci_device_id s2io_tbl[] = { {PCI_VENDOR_ID_S2IO ,PCI_DEVICE_ID_S2IO_WIN ,PCI_ANY_ID ,PCI_ANY_ID }, {PCI_VENDOR_ID_S2IO ,PCI_DEVICE_ID_S2IO_UNI ,
drivers/net/ethernet/neterion/vxge/vxge-main.c +1 -1
@@ -63,7 +63,7 @@ MODULE_LICENSE("Dual BSD/GPL");MODULE_DESCRIPTION ("Neterion's X3100 Series 10GbE PCIe I/O" "Virtualized Server Adapter" ); -static DEFINE_PCI_DEVICE_TABLE (vxge_id_table) = { +static const struct pci_device_id vxge_id_table[] = { {PCI_VENDOR_ID_S2IO ,PCI_DEVICE_ID_TITAN_WIN ,PCI_ANY_ID ,PCI_ANY_ID }, {PCI_VENDOR_ID_S2IO ,PCI_DEVICE_ID_TITAN_UNI ,PCI_ANY_ID ,
drivers/net/ethernet/nvidia/forcedeth.c +1 -1
@@ -6185,7 +6185,7 @@ static void nv_shutdown(struct pci_dev *pdev)#define nv_shutdown NULL#endif /* CONFIG_PM */ -static DEFINE_PCI_DEVICE_TABLE (pci_tbl) = { +static const struct pci_device_id pci_tbl[] = { {/* nForce Ethernet Controller */ PCI_DEVICE (0x10DE ,0x01C3 ), .driver_data =DEV_NEED_TIMERIRQ |DEV_NEED_LINKTIMER ,
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +1 -1
@@ -2743,7 +2743,7 @@ static struct pch_gbe_privdata pch_gbe_minnow_privdata = { .platform_init = pch_gbe_minnow_platform_init, }; -static DEFINE_PCI_DEVICE_TABLE (pch_gbe_pcidev_id) = { +static const struct pci_device_id pch_gbe_pcidev_id[] = { {.vendor =PCI_VENDOR_ID_INTEL , .device =PCI_DEVICE_ID_INTEL_IOH1_GBE , .subvendor =PCI_VENDOR_ID_CIRCUITCO ,
drivers/net/ethernet/packetengines/hamachi.c +1 -1
@@ -1911,7 +1911,7 @@ static void hamachi_remove_one(struct pci_dev *pdev) } } -static DEFINE_PCI_DEVICE_TABLE (hamachi_pci_tbl) = { +static const struct pci_device_id hamachi_pci_tbl[] = { {0x1318 ,0x0911 ,PCI_ANY_ID ,PCI_ANY_ID , }, {0 , } };
drivers/net/ethernet/packetengines/yellowfin.c +1 -1
@@ -236,7 +236,7 @@ static const struct pci_id_info pci_id_tbl[] = { { } }; -static DEFINE_PCI_DEVICE_TABLE (yellowfin_pci_tbl) = { +static const struct pci_device_id yellowfin_pci_tbl[] = { {0x1000 ,0x0702 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {0x1000 ,0x0701 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, { }
drivers/net/ethernet/pasemi/pasemi_mac.c +1 -1
@@ -1871,7 +1871,7 @@ static void pasemi_mac_remove(struct pci_dev *pdev)free_netdev (netdev); } -static DEFINE_PCI_DEVICE_TABLE (pasemi_mac_pci_tbl) = { +static const struct pci_device_id pasemi_mac_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_PASEMI ,0xa005 ) }, {PCI_DEVICE (PCI_VENDOR_ID_PASEMI ,0xa006 ) }, { },
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +1 -1
@@ -99,7 +99,7 @@ static int netxen_nic_set_mac(struct net_device *netdev, void *p); {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \ .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} -static DEFINE_PCI_DEVICE_TABLE (netxen_pci_tbl) = { +static const struct pci_device_id netxen_pci_tbl[] = {ENTRY (PCI_DEVICE_ID_NX2031_10GXSR ),ENTRY (PCI_DEVICE_ID_NX2031_10GCX4 ),ENTRY (PCI_DEVICE_ID_NX2031_4GCU ),
drivers/net/ethernet/qlogic/qla3xxx.c +1 -1
@@ -65,7 +65,7 @@ static int msi;module_param (msi, int,0 );MODULE_PARM_DESC (msi,"Turn on Message Signaled Interrupts." ); -static DEFINE_PCI_DEVICE_TABLE (ql3xxx_pci_tbl) = { +static const struct pci_device_id ql3xxx_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_QLOGIC ,QL3022_DEVICE_ID )}, {PCI_DEVICE (PCI_VENDOR_ID_QLOGIC ,QL3032_DEVICE_ID )},/* required last entry */
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +1 -1
@@ -108,7 +108,7 @@ static u32 qlcnic_vlan_tx_check(struct qlcnic_adapter *adapter) {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \ .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} -static DEFINE_PCI_DEVICE_TABLE (qlcnic_pci_tbl) = { +static const struct pci_device_id qlcnic_pci_tbl[] = {ENTRY (PCI_DEVICE_ID_QLOGIC_QLE824X ),ENTRY (PCI_DEVICE_ID_QLOGIC_QLE834X ),ENTRY (PCI_DEVICE_ID_QLOGIC_VF_QLE834X ),
drivers/net/ethernet/qlogic/qlge/qlge_main.c +1 -1
@@ -86,7 +86,7 @@ MODULE_PARM_DESC(qlge_force_coredump,"Option to allow force of firmware core dump. " "Default is OFF - Do not allow."); -static DEFINE_PCI_DEVICE_TABLE (qlge_pci_tbl) = { +static const struct pci_device_id qlge_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_QLOGIC ,QLGE_DEVICE_ID_8012 )}, {PCI_DEVICE (PCI_VENDOR_ID_QLOGIC ,QLGE_DEVICE_ID_8000 )},/* required last entry */
drivers/net/ethernet/rdc/r6040.c +1 -1
@@ -1254,7 +1254,7 @@ static void r6040_remove_one(struct pci_dev *pdev) } -static DEFINE_PCI_DEVICE_TABLE (r6040_pci_tbl) = { +static const struct pci_device_id r6040_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_RDC ,0x6040 ) }, {0 } };
drivers/net/ethernet/realtek/8139too.c +1 -1
@@ -234,7 +234,7 @@ static const struct { }; -static DEFINE_PCI_DEVICE_TABLE (rtl8139_pci_tbl) = { +static const struct pci_device_id rtl8139_pci_tbl[] = { {0x10ec ,0x8139 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,RTL8139 }, {0x10ec ,0x8138 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,RTL8139 }, {0x1113 ,0x1211 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,RTL8139 },
drivers/net/ethernet/realtek/r8169.c +1 -1
@@ -291,7 +291,7 @@ enum cfg_version {RTL_CFG_2 }; -static DEFINE_PCI_DEVICE_TABLE (rtl8169_pci_tbl) = { +static const struct pci_device_id rtl8169_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8129 ),0 ,0 ,RTL_CFG_0 }, {PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8136 ),0 ,0 ,RTL_CFG_2 }, {PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8167 ),0 ,0 ,RTL_CFG_0 },
drivers/net/ethernet/sfc/efx.c +1 -1
@@ -2642,7 +2642,7 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type)**************************************************************************/ /* PCI device ID table */ -static DEFINE_PCI_DEVICE_TABLE (efx_pci_table) = { +static const struct pci_device_id efx_pci_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_SOLARFLARE ,PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0 ), .driver_data = (unsigned long ) &falcon_a1_nic_type},
drivers/net/ethernet/sgi/ioc3-eth.c +1 -1
@@ -1384,7 +1384,7 @@ static void ioc3_remove_one(struct pci_dev *pdev)*/ } -static DEFINE_PCI_DEVICE_TABLE (ioc3_pci_tbl) = { +static const struct pci_device_id ioc3_pci_tbl[] = { {PCI_VENDOR_ID_SGI ,PCI_DEVICE_ID_SGI_IOC3 ,PCI_ANY_ID ,PCI_ANY_ID }, {0 } };
drivers/net/ethernet/silan/sc92031.c +1 -1
@@ -1561,7 +1561,7 @@ out:return 0 ; } -static DEFINE_PCI_DEVICE_TABLE (sc92031_pci_device_id_table) = { +static const struct pci_device_id sc92031_pci_device_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_SILAN ,0x2031 ) }, {PCI_DEVICE (PCI_VENDOR_ID_SILAN ,0x8139 ) }, {PCI_DEVICE (0x1088 ,0x2031 ) },
drivers/net/ethernet/sis/sis190.c +1 -1
@@ -330,7 +330,7 @@ static const struct { { "SiS 191 PCI Gigabit Ethernet adapter" }, }; -static DEFINE_PCI_DEVICE_TABLE (sis190_pci_tbl) = { +static const struct pci_device_id sis190_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_SI ,0x0190 ),0 ,0 ,0 }, {PCI_DEVICE (PCI_VENDOR_ID_SI ,0x0191 ),0 ,0 ,1 }, { 0, },
drivers/net/ethernet/sis/sis900.c +2 -1
@@ -106,7 +106,8 @@ static const char * card_names[] = {"SiS 900 PCI Fast Ethernet" ,"SiS 7016 PCI Fast Ethernet" }; -static DEFINE_PCI_DEVICE_TABLE (sis900_pci_tbl) = { + +static const struct pci_device_id sis900_pci_tbl[] = { {PCI_VENDOR_ID_SI ,PCI_DEVICE_ID_SI_900 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,SIS_900 }, {PCI_VENDOR_ID_SI ,PCI_DEVICE_ID_SI_7016 ,
drivers/net/ethernet/smsc/epic100.c +1 -1
@@ -173,7 +173,7 @@ static const struct epic_chip_info pci_id_tbl[] = { }; -static DEFINE_PCI_DEVICE_TABLE (epic_pci_tbl) = { +static const struct pci_device_id epic_pci_tbl[] = { {0x10B8 ,0x0005 ,0x1092 ,0x0AB4 ,0 ,0 ,SMSC_83C170_0 }, {0x10B8 ,0x0005 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,SMSC_83C170 }, {0x10B8 ,0x0006 ,PCI_ANY_ID ,PCI_ANY_ID ,
drivers/net/ethernet/smsc/smsc9420.c +1 -1
@@ -83,7 +83,7 @@ struct smsc9420_pdata {int last_carrier; }; -static DEFINE_PCI_DEVICE_TABLE (smsc9420_id_table) = { +static const struct pci_device_id smsc9420_id_table[] = { {PCI_VENDOR_ID_9420 ,PCI_DEVICE_ID_9420 ,PCI_ANY_ID ,PCI_ANY_ID , }, {0 , } };
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +1 -1
@@ -170,7 +170,7 @@ static int stmmac_pci_resume(struct pci_dev *pdev)#define STMMAC_VENDOR_ID 0x700#define STMMAC_DEVICE_ID 0x1108 -static DEFINE_PCI_DEVICE_TABLE (stmmac_id_table) = { +static const struct pci_device_id stmmac_id_table[] = { {PCI_DEVICE (STMMAC_VENDOR_ID ,STMMAC_DEVICE_ID )}, {PCI_DEVICE (PCI_VENDOR_ID_STMICRO ,PCI_DEVICE_ID_STMICRO_MAC )}, {}
drivers/net/ethernet/sun/cassini.c +1 -1
@@ -229,7 +229,7 @@ static u16 link_modes[] = {CAS_BMCR_SPEED1000 |BMCR_FULLDPLX /* 5 : 1000bt full duplex */ }; -static DEFINE_PCI_DEVICE_TABLE (cas_pci_tbl) = { +static const struct pci_device_id cas_pci_tbl[] = { {PCI_VENDOR_ID_SUN ,PCI_DEVICE_ID_SUN_CASSINI ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0UL }, {PCI_VENDOR_ID_NS ,PCI_DEVICE_ID_NS_SATURN ,
drivers/net/ethernet/sun/niu.c +1 -1
@@ -59,7 +59,7 @@ static void writeq(u64 val, void __iomem *reg) }#endif -static DEFINE_PCI_DEVICE_TABLE (niu_pci_tbl) = { +static const struct pci_device_id niu_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_SUN ,0xabcd )}, {} };
drivers/net/ethernet/sun/sungem.c +1 -1
@@ -85,7 +85,7 @@ MODULE_LICENSE("GPL");#define GEM_MODULE_NAME "gem" -static DEFINE_PCI_DEVICE_TABLE (gem_pci_tbl) = { +static const struct pci_device_id gem_pci_tbl[] = { {PCI_VENDOR_ID_SUN ,PCI_DEVICE_ID_SUN_GEM ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0UL },
drivers/net/ethernet/sun/sunhme.c +1 -1
@@ -3172,7 +3172,7 @@ static void happy_meal_pci_remove(struct pci_dev *pdev)free_netdev (net_dev); } -static DEFINE_PCI_DEVICE_TABLE (happymeal_pci_ids) = { +static const struct pci_device_id happymeal_pci_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_SUN ,PCI_DEVICE_ID_SUN_HAPPYMEAL ) }, { }/* Terminating entry */ };
drivers/net/ethernet/tehuti/tehuti.c +1 -1
@@ -66,7 +66,7 @@#include "tehuti.h" -static DEFINE_PCI_DEVICE_TABLE (bdx_pci_tbl) = { +static const struct pci_device_id bdx_pci_tbl[] = { {PCI_VDEVICE (TEHUTI ,0x3009 ), }, {PCI_VDEVICE (TEHUTI ,0x3010 ), }, {PCI_VDEVICE (TEHUTI ,0x3014 ), },
drivers/net/ethernet/ti/tlan.c +1 -1
@@ -116,7 +116,7 @@ static struct board { TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */ }; -static DEFINE_PCI_DEVICE_TABLE (tlan_pci_tbl) = { +static const struct pci_device_id tlan_pci_tbl[] = { {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_NETEL10 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {PCI_VENDOR_ID_COMPAQ ,PCI_DEVICE_ID_COMPAQ_NETEL100 ,
drivers/net/ethernet/toshiba/spider_net.c +1 -1
@@ -73,7 +73,7 @@ MODULE_PARM_DESC(tx_descriptors, "number of descriptors used " \char spider_net_driver_name[] ="spidernet" ; -static DEFINE_PCI_DEVICE_TABLE (spider_net_pci_tbl) = { +static const struct pci_device_id spider_net_pci_tbl[] = { {PCI_VENDOR_ID_TOSHIBA_2 ,PCI_DEVICE_ID_TOSHIBA_SPIDER_NET ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0UL }, {0 , }
drivers/net/ethernet/toshiba/tc35815.c +1 -1
@@ -65,7 +65,7 @@ static const struct { { "TOSHIBA TC35815/TX4939" }, }; -static DEFINE_PCI_DEVICE_TABLE (tc35815_pci_tbl) = { +static const struct pci_device_id tc35815_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_TOSHIBA_2 ,PCI_DEVICE_ID_TOSHIBA_TC35815CF ), .driver_data =TC35815CF }, {PCI_DEVICE (PCI_VENDOR_ID_TOSHIBA_2 ,PCI_DEVICE_ID_TOSHIBA_TC35815_NWU ), .driver_data =TC35815_NWU }, {PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939), .driver_data = TC35815_TX4939 },
drivers/net/ethernet/via/via-rhine.c +1 -1
@@ -273,7 +273,7 @@ enum rhine_quirks {/* Beware of PCI posted writes */ #define IOSYNC do { ioread8(ioaddr + StationAddr); } while (0) -static DEFINE_PCI_DEVICE_TABLE (rhine_pci_tbl) = { +static const struct pci_device_id rhine_pci_tbl[] = { {0x1106 ,0x3043 ,PCI_ANY_ID ,PCI_ANY_ID , },/* VT86C100A */ {0x1106 ,0x3065 ,PCI_ANY_ID ,PCI_ANY_ID , },/* VT6102 */ {0x1106 ,0x3106 ,PCI_ANY_ID ,PCI_ANY_ID , },/* 6105{,L,LOM} */
drivers/net/ethernet/via/via-velocity.c +1 -1
@@ -381,7 +381,7 @@ static struct velocity_info_tbl chip_info_table[] = {* device driver. Used for hotplug autoloading. */ -static DEFINE_PCI_DEVICE_TABLE (velocity_pci_id_table) = { +static const struct pci_device_id velocity_pci_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_612X ) }, { } };
drivers/net/fddi/defxx.c +1 -1
@@ -3664,7 +3664,7 @@ static int __maybe_unused dfx_dev_unregister(struct device *);static int dfx_pci_register (struct pci_dev *,const struct pci_device_id *);static void dfx_pci_unregister (struct pci_dev *); -static DEFINE_PCI_DEVICE_TABLE (dfx_pci_table) = { +static const struct pci_device_id dfx_pci_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_DEC ,PCI_DEVICE_ID_DEC_FDDI ) }, { } };
drivers/net/fddi/skfp/skfddi.c +1 -1
@@ -149,7 +149,7 @@ extern void mac_drv_rx_mode(struct s_smc *smc, int mode);extern void mac_drv_clear_rx_queue (struct s_smc *smc);extern void enable_tx_irq (struct s_smc *smc,u_short queue); -static DEFINE_PCI_DEVICE_TABLE (skfddi_pci_tbl) = { +static const struct pci_device_id skfddi_pci_tbl[] = { {PCI_VENDOR_ID_SK ,PCI_DEVICE_ID_SK_FP ,PCI_ANY_ID ,PCI_ANY_ID , }, { }/* Terminating entry */ };
drivers/net/hippi/rrunner.c +1 -1
@@ -1668,7 +1668,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } } -static DEFINE_PCI_DEVICE_TABLE (rr_pci_tbl) = { +static const struct pci_device_id rr_pci_tbl[] = { {PCI_VENDOR_ID_ESSENTIAL ,PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER ,PCI_ANY_ID ,PCI_ANY_ID , }, {0 ,}
drivers/net/irda/donauboe.c +1 -1
@@ -184,7 +184,7 @@#define CONFIG0H_DMA_ON_NORX CONFIG0H_DMA_OFF| OBOE_CONFIG0H_ENDMAC#define CONFIG0H_DMA_ON CONFIG0H_DMA_ON_NORX | OBOE_CONFIG0H_ENRX -static DEFINE_PCI_DEVICE_TABLE (toshoboe_pci_tbl) = { +static const struct pci_device_id toshoboe_pci_tbl[] = { {PCI_VENDOR_ID_TOSHIBA ,PCI_DEVICE_ID_FIR701 ,PCI_ANY_ID ,PCI_ANY_ID , }, {PCI_VENDOR_ID_TOSHIBA ,PCI_DEVICE_ID_FIRD01 ,PCI_ANY_ID ,PCI_ANY_ID , }, { }/* Terminating entry */
drivers/net/irda/via-ircc.c +1 -1
@@ -115,7 +115,7 @@ static void iodelay(int udelay) } } -static DEFINE_PCI_DEVICE_TABLE (via_pci_tbl) = { +static const struct pci_device_id via_pci_tbl[] = { {PCI_VENDOR_ID_VIA ,0x8231 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {PCI_VENDOR_ID_VIA ,0x3109 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,1 }, {PCI_VENDOR_ID_VIA ,0x3074 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,2 },
drivers/net/irda/vlsi_ir.c +1 -1
@@ -58,7 +58,7 @@ MODULE_LICENSE("GPL");static /* const */ char drivername[] =DRIVER_NAME ; -static DEFINE_PCI_DEVICE_TABLE (vlsi_irda_table) = { +static const struct pci_device_id vlsi_irda_table[] = { { .class =PCI_CLASS_WIRELESS_IRDA <<8 , .class_mask =PCI_CLASS_SUBCLASS_MASK <<8 ,
drivers/net/vmxnet3/vmxnet3_drv.c +1 -1
@@ -36,7 +36,7 @@ char vmxnet3_driver_name[] = "vmxnet3";* PCI Device ID Table * Last entry must be all 0s */ -static DEFINE_PCI_DEVICE_TABLE (vmxnet3_pciid_table) = { +static const struct pci_device_id vmxnet3_pciid_table[] = { {PCI_VDEVICE (VMWARE ,PCI_DEVICE_ID_VMWARE_VMXNET3 )}, {0 } };
drivers/net/wan/dscc4.c +1 -1
@@ -2039,7 +2039,7 @@ static int __init dscc4_setup(char *str)__setup ("dscc4.setup=" , dscc4_setup);#endif -static DEFINE_PCI_DEVICE_TABLE (dscc4_pci_tbl) = { +static const struct pci_device_id dscc4_pci_tbl[] = { {PCI_VENDOR_ID_SIEMENS ,PCI_DEVICE_ID_SIEMENS_DSCC4 ,PCI_ANY_ID ,PCI_ANY_ID , }, {0 ,}
drivers/net/wan/farsync.c +1 -1
@@ -531,7 +531,7 @@ do { \/* * PCI ID lookup table */ -static DEFINE_PCI_DEVICE_TABLE (fst_pci_dev_id) = { +static const struct pci_device_id fst_pci_dev_id[] = { {PCI_VENDOR_ID_FARSITE ,PCI_DEVICE_ID_FARSITE_T2P ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,FST_TYPE_T2P },
drivers/net/wan/lmc/lmc_main.c +1 -1
@@ -76,7 +76,7 @@static int LMC_PKT_BUF_SZ =1542 ; -static DEFINE_PCI_DEVICE_TABLE (lmc_pci_tbl) = { +static const struct pci_device_id lmc_pci_tbl[] = { {PCI_VENDOR_ID_DEC ,PCI_DEVICE_ID_DEC_TULIP_FAST ,PCI_VENDOR_ID_LMC ,PCI_ANY_ID }, {PCI_VENDOR_ID_DEC ,PCI_DEVICE_ID_DEC_TULIP_FAST ,
drivers/net/wan/pc300too.c +1 -1
@@ -477,7 +477,7 @@ static int pc300_pci_init_one(struct pci_dev *pdev, -static DEFINE_PCI_DEVICE_TABLE (pc300_pci_tbl) = { +static const struct pci_device_id pc300_pci_tbl[] = { {PCI_VENDOR_ID_CYCLADES ,PCI_DEVICE_ID_PC300_RX_1 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {PCI_VENDOR_ID_CYCLADES ,PCI_DEVICE_ID_PC300_RX_2 ,PCI_ANY_ID ,
drivers/net/wan/pci200syn.c +1 -1
@@ -414,7 +414,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev, -static DEFINE_PCI_DEVICE_TABLE (pci200_pci_tbl) = { +static const struct pci_device_id pci200_pci_tbl[] = { {PCI_VENDOR_ID_PLX ,PCI_DEVICE_ID_PLX_9050 ,PCI_VENDOR_ID_PLX ,PCI_DEVICE_ID_PLX_PCI200SYN ,0 ,0 ,0 }, {0 , }
drivers/net/wan/wanxl.c +1 -1
@@ -807,7 +807,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,return 0 ; } -static DEFINE_PCI_DEVICE_TABLE (wanxl_pci_tbl) = { +static const struct pci_device_id wanxl_pci_tbl[] = { {PCI_VENDOR_ID_SBE ,PCI_DEVICE_ID_SBE_WANXL100 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {PCI_VENDOR_ID_SBE ,PCI_DEVICE_ID_SBE_WANXL200 ,PCI_ANY_ID ,
drivers/net/wireless/adm8211.c +1 -1
@@ -41,7 +41,7 @@ static unsigned int rx_ring_size __read_mostly = 16;module_param (tx_ring_size, uint,0 );module_param (rx_ring_size, uint,0 ); -static DEFINE_PCI_DEVICE_TABLE (adm8211_pci_id_table) = { +static const struct pci_device_id adm8211_pci_id_table[] = {/* ADMtek ADM8211 */ {PCI_DEVICE (0x10B7 ,0x6000 ) },/* 3Com 3CRSHPW796 */ {PCI_DEVICE (0x1200 ,0x8201 ) },/* ? */
drivers/net/wireless/airo.c +1 -1
@@ -57,7 +57,7 @@#define DRV_NAME "airo"#ifdef CONFIG_PCI -static DEFINE_PCI_DEVICE_TABLE (card_ids) = { +static const struct pci_device_id card_ids[] = { {0x14b9 ,1 ,PCI_ANY_ID ,PCI_ANY_ID , }, {0x14b9 ,0x4500 ,PCI_ANY_ID ,PCI_ANY_ID }, { 0x14b9, 0x4800, PCI_ANY_ID, PCI_ANY_ID, },
drivers/net/wireless/ath/ath10k/pci.c +1 -1
@@ -63,7 +63,7 @@ MODULE_PARM_DESC(reset_mode, "0: auto, 1: warm only (default: 0)");#define QCA988X_2_0_DEVICE_ID (0x003c) -static DEFINE_PCI_DEVICE_TABLE (ath10k_pci_id_table) = { +static const struct pci_device_id ath10k_pci_id_table[] = { {PCI_VDEVICE (ATHEROS ,QCA988X_2_0_DEVICE_ID ) },/* PCI-E QCA988X V2 */ {0 } };
drivers/net/wireless/ath/ath5k/led.c +1 -1
@@ -53,7 +53,7 @@#define ATH_POLARITY (data) ((data) & 0xff)/* Devices we match on for LED config info (typically laptops) */ -static DEFINE_PCI_DEVICE_TABLE (ath5k_led_devices) = { +static const struct pci_device_id ath5k_led_devices[] = {/* AR5211 */ {PCI_VDEVICE (ATHEROS ,PCI_DEVICE_ID_ATHEROS_AR5211 ),ATH_LED (0 ,0 ) },/* HP Compaq nc6xx, nc4000, nx6000 */
drivers/net/wireless/ath/ath5k/pci.c +1 -1
@@ -28,7 +28,7 @@#include "reg.h" /* Known PCI ids */ -static DEFINE_PCI_DEVICE_TABLE (ath5k_pci_id_table) = { +static const struct pci_device_id ath5k_pci_id_table[] = { {PCI_VDEVICE (ATHEROS ,0x0207 ) },/* 5210 early */ {PCI_VDEVICE (ATHEROS ,0x0007 ) },/* 5210 */ {PCI_VDEVICE (ATHEROS ,0x0011 ) },/* 5311 - this is on AHB bus !*/
drivers/net/wireless/ath/ath9k/pci.c +1 -1
@@ -23,7 +23,7 @@#include <linux/module.h> #include "ath9k.h" -static DEFINE_PCI_DEVICE_TABLE (ath_pci_id_table) = { +static const struct pci_device_id ath_pci_id_table[] = { {PCI_VDEVICE (ATHEROS ,0x0023 ) },/* PCI */ {PCI_VDEVICE (ATHEROS ,0x0024 ) },/* PCI-E */ {PCI_VDEVICE (ATHEROS ,0x0027 ) },/* PCI */
drivers/net/wireless/atmel_pci.c +1 -1
@@ -30,7 +30,7 @@ MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.")MODULE_LICENSE ("GPL" );MODULE_SUPPORTED_DEVICE ("Atmel at76c506 PCI wireless cards" ); -static DEFINE_PCI_DEVICE_TABLE (card_ids) = { +static const struct pci_device_id card_ids[] = { {0x1114 ,0x0506 ,PCI_ANY_ID ,PCI_ANY_ID }, {0 , } };
drivers/net/wireless/hostap/hostap_pci.c +1 -1
@@ -39,7 +39,7 @@ struct hostap_pci_priv {/* FIX: do we need mb/wmb/rmb with memory operations? */ -static DEFINE_PCI_DEVICE_TABLE (prism2_pci_id_table) = { +static const struct pci_device_id prism2_pci_id_table[] = {/* Intersil Prism3 ISL3872 11Mb/s WLAN Controller */ {0x1260 ,0x3872 ,PCI_ANY_ID ,PCI_ANY_ID },/* Intersil Prism2.5 ISL3874 11Mb/s WLAN Controller */
drivers/net/wireless/hostap/hostap_plx.c +1 -1
@@ -60,7 +60,7 @@ struct hostap_plx_priv {#define PLXDEV (vendor,dev,str) { vendor, dev, PCI_ANY_ID, PCI_ANY_ID } -static DEFINE_PCI_DEVICE_TABLE (prism2_plx_id_table) = { +static const struct pci_device_id prism2_plx_id_table[] = {PLXDEV (0x10b7 ,0x7770 ,"3Com AirConnect PCI 777A" ),PLXDEV (0x111a ,0x1023 ,"Siemens SpeedStream SS1023" ),PLXDEV (0x126c ,0x8030 ,"Nortel emobility" ),
drivers/net/wireless/ipw2x00/ipw2100.c +1 -1
@@ -6505,7 +6505,7 @@ static void ipw2100_shutdown(struct pci_dev *pci_dev)#define IPW2100_DEV_ID (x) { PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, x } -static DEFINE_PCI_DEVICE_TABLE (ipw2100_pci_id_table) = { +static const struct pci_device_id ipw2100_pci_id_table[] = {IPW2100_DEV_ID (0x2520 ),/* IN 2100A mPCI 3A */ IPW2100_DEV_ID (0x2521 ),/* IN 2100A mPCI 3B */ IPW2100_DEV_ID (0x2524 ),/* IN 2100A mPCI 3B */
drivers/net/wireless/ipw2x00/ipw2200.c +1 -1
@@ -11542,7 +11542,7 @@ out: }/* PCI driver stuff */ -static DEFINE_PCI_DEVICE_TABLE (card_ids) = { +static const struct pci_device_id card_ids[] = { {PCI_VENDOR_ID_INTEL ,0x1043 ,0x8086 ,0x2701 ,0 ,0 ,0 }, {PCI_VENDOR_ID_INTEL ,0x1043 ,0x8086 ,0x2702 ,0 ,0 ,0 }, {PCI_VENDOR_ID_INTEL ,0x1043 ,0x8086 ,0x2711 ,0 ,0 ,0 },
drivers/net/wireless/iwlegacy/3945.c +1 -1
@@ -2728,7 +2728,7 @@ static struct il_cfg il3945_abg_cfg = { }, }; -DEFINE_PCI_DEVICE_TABLE (il3945_hw_card_ids) = { +const struct pci_device_id il3945_hw_card_ids[] = { {IL_PCI_DEVICE (0x4222 ,0x1005 , il3945_bg_cfg)}, {IL_PCI_DEVICE (0x4222 ,0x1034 , il3945_bg_cfg)}, {IL_PCI_DEVICE (0x4222 ,0x1044 , il3945_bg_cfg)},
drivers/net/wireless/iwlegacy/4965-mac.c +1 -1
@@ -6800,7 +6800,7 @@ il4965_txq_set_sched(struct il_priv *il, u32 mask)*****************************************************************************/ /* Hardware specific file defines the PCI IDs table for that hardware module */ -static DEFINE_PCI_DEVICE_TABLE (il4965_hw_card_ids) = { +static const struct pci_device_id il4965_hw_card_ids[] = { {IL_PCI_DEVICE (0x4229 ,PCI_ANY_ID , il4965_cfg)}, {IL_PCI_DEVICE (0x4230 ,PCI_ANY_ID , il4965_cfg)}, {0 }
drivers/net/wireless/iwlwifi/pcie/drv.c +1 -1
@@ -78,7 +78,7 @@ .driver_data = (kernel_ulong_t)&(cfg) /* Hardware specific file defines the PCI IDs table for that hardware module */ -static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { +static const struct pci_device_id iwl_hw_card_ids[] = {#if IS_ENABLED (CONFIG_IWLDVM ) {IWL_PCI_DEVICE(0x4232, 0x1201, iwl5100_agn_cfg)}, /* Mini Card */ {IWL_PCI_DEVICE(0x4232, 0x1301, iwl5100_agn_cfg)}, /* Half Mini Card */
drivers/net/wireless/mwifiex/pcie.c +1 -1
@@ -257,7 +257,7 @@ static void mwifiex_pcie_shutdown(struct pci_dev *pdev)return ; } -static DEFINE_PCI_DEVICE_TABLE (mwifiex_ids) = { +static const struct pci_device_id mwifiex_ids[] = { {PCIE_VENDOR_ID_MARVELL ,PCIE_DEVICE_ID_MARVELL_88W8766P ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,
drivers/net/wireless/mwl8k.c +1 -1
@@ -5674,7 +5674,7 @@ MODULE_FIRMWARE("mwl8k/helper_8366.fw");MODULE_FIRMWARE ("mwl8k/fmimage_8366.fw" );MODULE_FIRMWARE (MWL8K_8366_AP_FW (MWL8K_8366_AP_FW_API )); -static DEFINE_PCI_DEVICE_TABLE (mwl8k_pci_id_table) = { +static const struct pci_device_id mwl8k_pci_id_table[] = { {PCI_VDEVICE (MARVELL ,0x2a0a ), .driver_data =MWL8363 , }, {PCI_VDEVICE (MARVELL ,0x2a0c ), .driver_data =MWL8363 , }, {PCI_VDEVICE (MARVELL ,0x2a24 ), .driver_data =MWL8363 , },
drivers/net/wireless/orinoco/orinoco_nortel.c +1 -1
@@ -272,7 +272,7 @@ static void orinoco_nortel_remove_one(struct pci_dev *pdev)pci_disable_device (pdev); } -static DEFINE_PCI_DEVICE_TABLE (orinoco_nortel_id_table) = { +static const struct pci_device_id orinoco_nortel_id_table[] = {/* Nortel emobility PCI */ {0x126c ,0x8030 ,PCI_ANY_ID ,PCI_ANY_ID ,},/* Symbol LA-4123 PCI */
drivers/net/wireless/orinoco/orinoco_pci.c +1 -1
@@ -210,7 +210,7 @@ static void orinoco_pci_remove_one(struct pci_dev *pdev)pci_disable_device (pdev); } -static DEFINE_PCI_DEVICE_TABLE (orinoco_pci_id_table) = { +static const struct pci_device_id orinoco_pci_id_table[] = {/* Intersil Prism 3 */ {0x1260 ,0x3872 ,PCI_ANY_ID ,PCI_ANY_ID ,},/* Intersil Prism 2.5 */
drivers/net/wireless/orinoco/orinoco_plx.c +1 -1
@@ -308,7 +308,7 @@ static void orinoco_plx_remove_one(struct pci_dev *pdev)pci_disable_device (pdev); } -static DEFINE_PCI_DEVICE_TABLE (orinoco_plx_id_table) = { +static const struct pci_device_id orinoco_plx_id_table[] = { {0x111a ,0x1023 ,PCI_ANY_ID ,PCI_ANY_ID ,},/* Siemens SpeedStream SS1023 */ {0x1385 ,0x4100 ,PCI_ANY_ID ,PCI_ANY_ID ,},/* Netgear MA301 */ {0x15e8 ,0x0130 ,PCI_ANY_ID ,PCI_ANY_ID ,},/* Correga - does this work? */
drivers/net/wireless/orinoco/orinoco_tmd.c +1 -1
@@ -201,7 +201,7 @@ static void orinoco_tmd_remove_one(struct pci_dev *pdev)pci_disable_device (pdev); } -static DEFINE_PCI_DEVICE_TABLE (orinoco_tmd_id_table) = { +static const struct pci_device_id orinoco_tmd_id_table[] = { {0x15e8 ,0x0131 ,PCI_ANY_ID ,PCI_ANY_ID ,},/* NDC and OEMs, e.g. pheecom */ {0 ,}, };
drivers/net/wireless/p54/p54pci.c +1 -1
@@ -32,7 +32,7 @@ MODULE_LICENSE("GPL");MODULE_ALIAS ("prism54pci" );MODULE_FIRMWARE ("isl3886pci" ); -static DEFINE_PCI_DEVICE_TABLE (p54p_table) = { +static const struct pci_device_id p54p_table[] = {/* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ {PCI_DEVICE (0x1260 ,0x3890 ) },/* 3COM 3CRWE154G72 Wireless LAN adapter */
drivers/net/wireless/prism54/islpci_hotplug.c +1 -1
@@ -39,7 +39,7 @@ module_param(init_pcitm, int, 0);* driver_data * If you have an update for this please contact [email protected] * The latest list can be found at http://wireless.kernel.org/en/users/Drivers/p54 */ -static DEFINE_PCI_DEVICE_TABLE (prism54_id_tbl) = { +static const struct pci_device_id prism54_id_tbl[] = {/* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ {0x1260 ,0x3890 ,
drivers/net/wireless/rt2x00/rt2400pci.c +1 -1
@@ -1821,7 +1821,7 @@ static const struct rt2x00_ops rt2400pci_ops = {/* * RT2400pci module information. */ -static DEFINE_PCI_DEVICE_TABLE (rt2400pci_device_table) = { +static const struct pci_device_id rt2400pci_device_table[] = { {PCI_DEVICE (0x1814 ,0x0101 ) }, {0 , } };
drivers/net/wireless/rt2x00/rt2500pci.c +1 -1
@@ -2120,7 +2120,7 @@ static const struct rt2x00_ops rt2500pci_ops = {/* * RT2500pci module information. */ -static DEFINE_PCI_DEVICE_TABLE (rt2500pci_device_table) = { +static const struct pci_device_id rt2500pci_device_table[] = { {PCI_DEVICE (0x1814 ,0x0201 ) }, {0 , } };
drivers/net/wireless/rt2x00/rt2800pci.c +1 -1
@@ -400,7 +400,7 @@ static const struct rt2x00_ops rt2800pci_ops = {/* * RT2800pci module information. */ -static DEFINE_PCI_DEVICE_TABLE (rt2800pci_device_table) = { +static const struct pci_device_id rt2800pci_device_table[] = { {PCI_DEVICE (0x1814 ,0x0601 ) }, {PCI_DEVICE (0x1814 ,0x0681 ) }, {PCI_DEVICE (0x1814 ,0x0701 ) },
drivers/net/wireless/rt2x00/rt61pci.c +1 -1
@@ -3075,7 +3075,7 @@ static const struct rt2x00_ops rt61pci_ops = {/* * RT61pci module information. */ -static DEFINE_PCI_DEVICE_TABLE (rt61pci_device_table) = { +static const struct pci_device_id rt61pci_device_table[] = {/* RT2561s */ {PCI_DEVICE (0x1814 ,0x0301 ) },/* RT2561 v2 */
drivers/net/wireless/rtl818x/rtl8180/dev.c +1 -1
@@ -64,7 +64,7 @@ MODULE_AUTHOR("Andrea Merello <[email protected]>");MODULE_DESCRIPTION ("RTL8180 / RTL8185 / RTL8187SE PCI wireless driver" );MODULE_LICENSE ("GPL" ); -static DEFINE_PCI_DEVICE_TABLE (rtl8180_table) = { +static const struct pci_device_id rtl8180_table[] = {/* rtl8187se */ {PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8199 ) },
drivers/net/wireless/rtlwifi/rtl8188ee/sw.c +1 -1
@@ -364,7 +364,7 @@ static struct rtl_hal_cfg rtl88ee_hal_cfg = { .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15, }; -static DEFINE_PCI_DEVICE_TABLE (rtl88ee_pci_ids) = { +static const struct pci_device_id rtl88ee_pci_ids[] = { {RTL_PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8179 , rtl88ee_hal_cfg)}, {}, };
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +1 -1
@@ -344,7 +344,7 @@ static struct rtl_hal_cfg rtl92ce_hal_cfg = { .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15, }; -static DEFINE_PCI_DEVICE_TABLE (rtl92ce_pci_ids) = { +static const struct pci_device_id rtl92ce_pci_ids[] = { {RTL_PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8191 , rtl92ce_hal_cfg)}, {RTL_PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8178 , rtl92ce_hal_cfg)}, {RTL_PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0x8177 , rtl92ce_hal_cfg)},
drivers/net/wireless/rtlwifi/rtl8723be/sw.c +1 -1
@@ -348,7 +348,7 @@ static struct rtl_hal_cfg rtl8723be_hal_cfg = { .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15, }; -static DEFINE_PCI_DEVICE_TABLE (rtl8723be_pci_id) = { +static const struct pci_device_id rtl8723be_pci_id[] = { {RTL_PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0xb723 , rtl8723be_hal_cfg)}, {}, };
drivers/pci/ioapic.c +1 -1
@@ -98,7 +98,7 @@ static void ioapic_remove(struct pci_dev *dev) } -static DEFINE_PCI_DEVICE_TABLE (ioapic_devices) = { +static const struct pci_device_id ioapic_devices[] = { {PCI_DEVICE_CLASS (PCI_CLASS_SYSTEM_PIC_IOAPIC , ~0 ) }, {PCI_DEVICE_CLASS (PCI_CLASS_SYSTEM_PIC_IOXAPIC , ~0 ) }, { }
drivers/platform/x86/intel_ips.c +1 -1
@@ -1478,7 +1478,7 @@ ips_link_to_i915_driver(void) }EXPORT_SYMBOL_GPL (ips_link_to_i915_driver); -static DEFINE_PCI_DEVICE_TABLE (ips_id_table) = { +static const struct pci_device_id ips_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_THERMAL_SENSOR ), }, {0 , }
drivers/platform/x86/intel_scu_ipc.c +1 -1
@@ -640,7 +640,7 @@ static void ipc_remove(struct pci_dev *pdev)intel_scu_devices_destroy (); } -static DEFINE_PCI_DEVICE_TABLE (pci_ids) = { +static const struct pci_device_id pci_ids[] = { {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_LINCROFT ), (kernel_ulong_t)&intel_scu_ipc_lincroft_pdata,
drivers/ptp/ptp_pch.c +1 -1
@@ -691,7 +691,7 @@ err_pci_en:return ret; } -static DEFINE_PCI_DEVICE_TABLE (pch_ieee1588_pcidev_id) = { +static const struct pci_device_id pch_ieee1588_pcidev_id[] = { { .vendor =PCI_VENDOR_ID_INTEL , .device =PCI_DEVICE_ID_PCH_1588
drivers/rapidio/devices/tsi721.c +1 -1
@@ -2493,7 +2493,7 @@ err_exit:return err; } -static DEFINE_PCI_DEVICE_TABLE (tsi721_pci_tbl) = { +static const struct pci_device_id tsi721_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_IDT ,PCI_DEVICE_ID_TSI721 ) }, {0 , }/* terminate list */ };
drivers/scsi/BusLogic.c +1 -1
@@ -3893,7 +3893,7 @@ __setup("BusLogic=", blogic_setup);PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { } };*/ -static DEFINE_PCI_DEVICE_TABLE (blogic_pci_tbl) = { +static const struct pci_device_id blogic_pci_tbl[] = { {PCI_DEVICE (PCI_VENDOR_ID_BUSLOGIC ,PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER )}, {PCI_DEVICE (PCI_VENDOR_ID_BUSLOGIC ,PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC )}, {PCI_DEVICE (PCI_VENDOR_ID_BUSLOGIC ,PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT )},
drivers/scsi/be2iscsi/be_main.c +1 -1
@@ -539,7 +539,7 @@ static umode_t beiscsi_eth_get_attr_visibility(void *data, int type) }/*------------------- PCI Driver operations and data ----------------- */ -static DEFINE_PCI_DEVICE_TABLE (beiscsi_pci_id_table) = { +static const struct pci_device_id beiscsi_pci_id_table[] = { {PCI_DEVICE (BE_VENDOR_ID ,BE_DEVICE_ID1 ) }, {PCI_DEVICE (BE_VENDOR_ID ,BE_DEVICE_ID2 ) }, {PCI_DEVICE (BE_VENDOR_ID ,OC_DEVICE_ID1 ) },
drivers/scsi/csiostor/csio_init.c +1 -1
@@ -1167,7 +1167,7 @@ static struct pci_error_handlers csio_err_handler = { .resume = csio_pci_resume, }; -static DEFINE_PCI_DEVICE_TABLE (csio_pci_tbl) = { +static const struct pci_device_id csio_pci_tbl[] = {CSIO_DEVICE (CSIO_DEVID_T440DBG_FCOE ,0 ),/* T4 DEBUG FCOE */ CSIO_DEVICE (CSIO_DEVID_T420CR_FCOE ,0 ),/* T420CR FCOE */ CSIO_DEVICE (CSIO_DEVID_T422CR_FCOE ,0 ),/* T422CR FCOE */
drivers/scsi/isci/init.c +1 -1
@@ -75,7 +75,7 @@ MODULE_VERSION(DRV_VERSION);static struct scsi_transport_template *isci_transport_template; -static DEFINE_PCI_DEVICE_TABLE (isci_id_table) = { +static const struct pci_device_id isci_id_table[] = { {PCI_VDEVICE (INTEL ,0x1D61 ),}, {PCI_VDEVICE (INTEL ,0x1D63 ),}, {PCI_VDEVICE (INTEL ,0x1D65 ),},
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
@@ -247,7 +247,7 @@ struct _scsi_io_transfer {/* * The pci device ids are defined in mpi/mpi2_cnfg.h. */ -static DEFINE_PCI_DEVICE_TABLE (scsih_pci_table) = { +static const struct pci_device_id scsih_pci_table[] = {/* Fury ~ 3004 and 3008 */ {MPI2_MFGPAGE_VENDORID_LSI ,MPI25_MFGPAGE_DEVID_SAS3004 ,PCI_ANY_ID ,PCI_ANY_ID },
drivers/scsi/mvumi.c +1 -1
@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL");MODULE_AUTHOR ("[email protected]" );MODULE_DESCRIPTION ("Marvell UMI Driver" ); -static DEFINE_PCI_DEVICE_TABLE (mvumi_pci_table) = { +static const struct pci_device_id mvumi_pci_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_MARVELL_EXT ,PCI_DEVICE_ID_MARVELL_MV9143 ) }, {PCI_DEVICE (PCI_VENDOR_ID_MARVELL_EXT ,PCI_DEVICE_ID_MARVELL_MV9580 ) }, {0 }
drivers/scsi/ufs/ufshcd-pci.c +1 -1
@@ -185,7 +185,7 @@ static const struct dev_pm_ops ufshcd_pci_pm_ops = { .runtime_idle = ufshcd_pci_runtime_idle, }; -static DEFINE_PCI_DEVICE_TABLE (ufshcd_pci_tbl) = { +static const struct pci_device_id ufshcd_pci_tbl[] = { {PCI_VENDOR_ID_SAMSUNG ,0xC00C ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, { }/* terminate list */ };
drivers/video/fbdev/hyperv_fb.c +1 -1
@@ -892,7 +892,7 @@ static int hvfb_remove(struct hv_device *hdev) } -static DEFINE_PCI_DEVICE_TABLE (pci_stub_id_table) = { +static const struct pci_device_id pci_stub_id_table[] = { { .vendor =PCI_VENDOR_ID_MICROSOFT , .device =PCI_DEVICE_ID_HYPERV_VIDEO ,
drivers/video/fbdev/i740fb.c +1 -1
@@ -1260,7 +1260,7 @@ fail:#define I740_ID_PCI 0x00d1#define I740_ID_AGP 0x7800 -static DEFINE_PCI_DEVICE_TABLE (i740fb_id_table) = { +static const struct pci_device_id i740fb_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,I740_ID_PCI ) }, {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,I740_ID_AGP ) }, {0 }
drivers/xen/xen-pciback/pci_stub.c +1 -1
@@ -581,7 +581,7 @@ static void pcistub_remove(struct pci_dev *dev) } } -static DEFINE_PCI_DEVICE_TABLE (pcistub_ids) = { +static const struct pci_device_id pcistub_ids[] = { { .vendor =PCI_ANY_ID , .device =PCI_ANY_ID ,
sound/oss/kahlua.c +1 -1
@@ -197,7 +197,7 @@ MODULE_LICENSE("GPL");* 5530 only. The 5510/5520 decode is different. */ -static DEFINE_PCI_DEVICE_TABLE (id_tbl) = { +static const struct pci_device_id id_tbl[] = { {PCI_VDEVICE (CYRIX ,PCI_DEVICE_ID_CYRIX_5530_AUDIO ),0 }, { } };
sound/pci/ad1889.c +1 -1
@@ -1045,7 +1045,7 @@ snd_ad1889_remove(struct pci_dev *pci)snd_card_free (pci_get_drvdata (pci)); } -static DEFINE_PCI_DEVICE_TABLE (snd_ad1889_ids) = { +static const struct pci_device_id snd_ad1889_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_ANALOG_DEVICES ,PCI_DEVICE_ID_AD1889JS ) }, {0 , }, };
sound/pci/ali5451/ali5451.c +1 -1
@@ -263,7 +263,7 @@ struct snd_ali {#endif }; -static DEFINE_PCI_DEVICE_TABLE (snd_ali_ids) = { +static const struct pci_device_id snd_ali_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M5451 ),0 ,0 ,0 }, {0 , } };
sound/pci/als300.c +1 -1
@@ -141,7 +141,7 @@ struct snd_als300_substream_data {int block_counter_register; }; -static DEFINE_PCI_DEVICE_TABLE (snd_als300_ids) = { +static const struct pci_device_id snd_als300_ids[] = { {0x4005 ,0x0300 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_ALS300 }, {0x4005 ,0x0308 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,DEVICE_ALS300_PLUS }, {0 , }
sound/pci/als4000.c +1 -1
@@ -116,7 +116,7 @@ struct snd_card_als4000 {#endif }; -static DEFINE_PCI_DEVICE_TABLE (snd_als4000_ids) = { +static const struct pci_device_id snd_als4000_ids[] = { {0x4005 ,0x4000 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 , },/* ALS4000 */ {0 , } };
sound/pci/asihpi/asihpi.c +1 -1
@@ -2955,7 +2955,7 @@ static void snd_asihpi_remove(struct pci_dev *pci_dev)asihpi_adapter_remove (pci_dev); } -static DEFINE_PCI_DEVICE_TABLE (asihpi_pci_tbl) = { +static const struct pci_device_id asihpi_pci_tbl[] = { {HPI_PCI_VENDOR_ID_TI ,HPI_PCI_DEV_ID_DSP6205 ,HPI_PCI_VENDOR_ID_AUDIOSCIENCE ,PCI_ANY_ID ,0 ,0 , (kernel_ulong_t )HPI_6205 },
sound/pci/atiixp.c +1 -1
@@ -286,7 +286,7 @@ struct atiixp {/* */ -static DEFINE_PCI_DEVICE_TABLE (snd_atiixp_ids) = { +static const struct pci_device_id snd_atiixp_ids[] = { {PCI_VDEVICE (ATI ,0x4341 ),0 },/* SB200 */ {PCI_VDEVICE (ATI ,0x4361 ),0 },/* SB300 */ {PCI_VDEVICE (ATI ,0x4370 ),0 },/* SB400 */
sound/pci/atiixp_modem.c +1 -1
@@ -261,7 +261,7 @@ struct atiixp_modem {/* */ -static DEFINE_PCI_DEVICE_TABLE (snd_atiixp_ids) = { +static const struct pci_device_id snd_atiixp_ids[] = { {PCI_VDEVICE (ATI ,0x434d ),0 },/* SB200 */ {PCI_VDEVICE (ATI ,0x4378 ),0 },/* SB400 */ {0 , }
sound/pci/au88x0/au8810.c +1 -1
@@ -1,6 +1,6 @@#include "au8810.h" #include "au88x0.h" -static DEFINE_PCI_DEVICE_TABLE (snd_vortex_ids) = { +static const struct pci_device_id snd_vortex_ids[] = { {PCI_VDEVICE (AUREAL ,PCI_DEVICE_ID_AUREAL_ADVANTAGE ),1 ,}, {0 ,} };
sound/pci/au88x0/au8820.c +1 -1
@@ -1,6 +1,6 @@#include "au8820.h" #include "au88x0.h" -static DEFINE_PCI_DEVICE_TABLE (snd_vortex_ids) = { +static const struct pci_device_id snd_vortex_ids[] = { {PCI_VDEVICE (AUREAL ,PCI_DEVICE_ID_AUREAL_VORTEX_1 ),0 ,}, {0 ,} };
sound/pci/au88x0/au8830.c +1 -1
@@ -1,6 +1,6 @@#include "au8830.h" #include "au88x0.h" -static DEFINE_PCI_DEVICE_TABLE (snd_vortex_ids) = { +static const struct pci_device_id snd_vortex_ids[] = { {PCI_VDEVICE (AUREAL ,PCI_DEVICE_ID_AUREAL_VORTEX_2 ),0 ,}, {0 ,} };
sound/pci/aw2/aw2-alsa.c +1 -1
@@ -160,7 +160,7 @@ MODULE_PARM_DESC(id, "ID string for the Audiowerk2 soundcard.");module_param_array (enable, bool,NULL ,0444 );MODULE_PARM_DESC (enable,"Enable Audiowerk2 soundcard." ); -static DEFINE_PCI_DEVICE_TABLE (snd_aw2_ids) = { +static const struct pci_device_id snd_aw2_ids[] = { {PCI_VENDOR_ID_PHILIPS ,PCI_DEVICE_ID_PHILIPS_SAA7146 ,0 ,0 ,0 ,0 ,0 }, {0 }
sound/pci/azt3328.c +1 -1
@@ -321,7 +321,7 @@ struct snd_azf3328 {#endif }; -static DEFINE_PCI_DEVICE_TABLE (snd_azf3328_ids) = { +static const struct pci_device_id snd_azf3328_ids[] = { {0x122D ,0x50DC ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* PCI168/3328 */ {0x122D ,0x80DA ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 },/* 3328 */ {0 , }
sound/pci/bt87x.c +2 -2
@@ -796,7 +796,7 @@ fail: .driver_data = SND_BT87X_BOARD_ ## id }/* driver_data is the card id for that device */ -static DEFINE_PCI_DEVICE_TABLE (snd_bt87x_ids) = { +static const struct pci_device_id snd_bt87x_ids[] = {/* Hauppauge WinTV series */ BT_DEVICE (PCI_DEVICE_ID_BROOKTREE_878 ,0x0070 ,0x13eb ,GENERIC ),/* Hauppauge WinTV series */
@@ -966,7 +966,7 @@ static void snd_bt87x_remove(struct pci_dev *pci)/* default entries for all Bt87x cards - it's not exported */ /* driver_data is set to 0 to call detection */ -static DEFINE_PCI_DEVICE_TABLE (snd_bt87x_default_ids) = { +static const struct pci_device_id snd_bt87x_default_ids[] = {BT_DEVICE (PCI_DEVICE_ID_BROOKTREE_878 ,PCI_ANY_ID ,PCI_ANY_ID ,UNKNOWN ),BT_DEVICE (PCI_DEVICE_ID_BROOKTREE_879 ,PCI_ANY_ID ,PCI_ANY_ID ,UNKNOWN ), { }
sound/pci/ca0106/ca0106_main.c +1 -1
@@ -1968,7 +1968,7 @@ static SIMPLE_DEV_PM_OPS(snd_ca0106_pm, snd_ca0106_suspend, snd_ca0106_resume);#endif // PCI IDs -static DEFINE_PCI_DEVICE_TABLE (snd_ca0106_ids) = { +static const struct pci_device_id snd_ca0106_ids[] = { {PCI_VDEVICE (CREATIVE ,0x0007 ),0 },/* Audigy LS or Live 24bit */ {0 , } };
sound/pci/cmipci.c +2 -2
@@ -2803,7 +2803,7 @@ static inline void snd_cmipci_proc_init(struct cmipci *cm) {}#endif -static DEFINE_PCI_DEVICE_TABLE (snd_cmipci_ids) = { +static const struct pci_device_id snd_cmipci_ids[] = { {PCI_VDEVICE (CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8338A ),0 }, {PCI_VDEVICE (CMEDIA ,PCI_DEVICE_ID_CMEDIA_CM8338B ),0 }, {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,int integrated_midi =0 ;char modelstr[16 ];int pcm_index, pcm_spdif_index; -static DEFINE_PCI_DEVICE_TABLE (intel_82437vx) = { +static const struct pci_device_id intel_82437vx[] = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82437VX ) }, { }, };
sound/pci/cs4281.c +1 -1
@@ -494,7 +494,7 @@ struct cs4281 {static irqreturn_t snd_cs4281_interrupt (int irq,void *dev_id); -static DEFINE_PCI_DEVICE_TABLE (snd_cs4281_ids) = { +static const struct pci_device_id snd_cs4281_ids[] = { {PCI_VDEVICE (CIRRUS ,0x6005 ),0 , },/* CS4281 */ {0 , } };
sound/pci/cs46xx/cs46xx.c +1 -1
@@ -64,7 +64,7 @@ MODULE_PARM_DESC(thinkpad, "Force to enable Thinkpad's CLKRUN control.");module_param_array (mmap_valid, bool,NULL ,0444 );MODULE_PARM_DESC (mmap_valid,"Support OSS mmap." ); -static DEFINE_PCI_DEVICE_TABLE (snd_cs46xx_ids) = { +static const struct pci_device_id snd_cs46xx_ids[] = { {PCI_VDEVICE (CIRRUS ,0x6001 ),0 , },/* CS4280 */ {PCI_VDEVICE (CIRRUS ,0x6003 ),0 , },/* CS4612 */ {PCI_VDEVICE (CIRRUS ,0x6004 ),0 , },/* CS4615 */
sound/pci/cs5530.c +1 -1
@@ -66,7 +66,7 @@ struct snd_cs5530 {unsigned long pci_base; }; -static DEFINE_PCI_DEVICE_TABLE (snd_cs5530_ids) = { +static const struct pci_device_id snd_cs5530_ids[] = { {PCI_VENDOR_ID_CYRIX ,PCI_DEVICE_ID_CYRIX_5530_AUDIO ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 }, {0 ,}
sound/pci/cs5535audio/cs5535audio.c +1 -1
@@ -66,7 +66,7 @@ MODULE_PARM_DESC(id, "ID string for " DRIVER_NAME);module_param_array (enable, bool,NULL ,0444 );MODULE_PARM_DESC (enable,"Enable " DRIVER_NAME ); -static DEFINE_PCI_DEVICE_TABLE (snd_cs5535audio_ids) = { +static const struct pci_device_id snd_cs5535audio_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_NS ,PCI_DEVICE_ID_NS_CS5535_AUDIO ) }, {PCI_DEVICE (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_CS5536_AUDIO ) }, {}
sound/pci/ctxfi/xfi.c +1 -1
@@ -44,7 +44,7 @@ MODULE_PARM_DESC(enable, "Enable Creative X-Fi driver");module_param_array (subsystem, int,NULL ,0444 );MODULE_PARM_DESC (subsystem,"Override subsystem ID for Creative X-Fi driver" ); -static DEFINE_PCI_DEVICE_TABLE (ct_pci_dev_ids) = { +static const struct pci_device_id ct_pci_dev_ids[] = {/* only X-Fi is supported, so... */ {PCI_DEVICE (PCI_VENDOR_ID_CREATIVE ,PCI_DEVICE_ID_CREATIVE_20K1 ), .driver_data =ATC20K1 ,
sound/pci/echoaudio/darla20.c +1 -1
@@ -63,7 +63,7 @@ static const struct firmware card_fw[] = { {0, "darla20_dsp.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x1801 ,0xECC0 ,0x0010 ,0 ,0 ,0 },/* DSP 56301 Darla20 rev.0 */ {0 ,} };
sound/pci/echoaudio/darla24.c +1 -1
@@ -67,7 +67,7 @@ static const struct firmware card_fw[] = { {0, "darla24_dsp.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x1801 ,0xECC0 ,0x0040 ,0 ,0 ,0 },/* DSP 56301 Darla24 rev.0 */ {0x1057 ,0x1801 ,0xECC0 ,0x0041 ,0 ,0 ,0 },/* DSP 56301 Darla24 rev.1 */ {0 ,}
sound/pci/echoaudio/echo3g.c +1 -1
@@ -81,7 +81,7 @@ static const struct firmware card_fw[] = { {0, "3g_asic.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x3410 ,0xECC0 ,0x0100 ,0 ,0 ,0 },/* Echo 3G */ {0 ,} };
sound/pci/echoaudio/gina20.c +1 -1
@@ -67,7 +67,7 @@ static const struct firmware card_fw[] = { {0, "gina20_dsp.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x1801 ,0xECC0 ,0x0020 ,0 ,0 ,0 },/* DSP 56301 Gina20 rev.0 */ {0 ,} };
sound/pci/echoaudio/gina24.c +1 -1
@@ -85,7 +85,7 @@ static const struct firmware card_fw[] = { {0, "gina24_361_asic.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x1801 ,0xECC0 ,0x0050 ,0 ,0 ,0 },/* DSP 56301 Gina24 rev.0 */ {0x1057 ,0x1801 ,0xECC0 ,0x0051 ,0 ,0 ,0 },/* DSP 56301 Gina24 rev.1 */ {0x1057 ,0x3410 ,0xECC0 ,0x0050 ,0 ,0 ,0 },/* DSP 56361 Gina24 rev.0 */
sound/pci/echoaudio/indigo.c +1 -1
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = { {0, "indigo_dsp.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x3410 ,0xECC0 ,0x0090 ,0 ,0 ,0 },/* Indigo */ {0 ,} };
sound/pci/echoaudio/indigodj.c +1 -1
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = { {0, "indigo_dj_dsp.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x3410 ,0xECC0 ,0x00B0 ,0 ,0 ,0 },/* Indigo DJ*/ {0 ,} };
sound/pci/echoaudio/indigodjx.c +1 -1
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = { {0, "indigo_djx_dsp.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x3410 ,0xECC0 ,0x00E0 ,0 ,0 ,0 },/* Indigo DJx*/ {0 ,} };
sound/pci/echoaudio/indigoio.c +1 -1
@@ -69,7 +69,7 @@ static const struct firmware card_fw[] = { {0, "indigo_io_dsp.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x3410 ,0xECC0 ,0x00A0 ,0 ,0 ,0 },/* Indigo IO*/ {0 ,} };
sound/pci/echoaudio/indigoiox.c +1 -1
@@ -69,7 +69,7 @@ static const struct firmware card_fw[] = { {0, "indigo_iox_dsp.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x3410 ,0xECC0 ,0x00D0 ,0 ,0 ,0 },/* Indigo IOx */ {0 ,} };
sound/pci/echoaudio/layla20.c +1 -1
@@ -76,7 +76,7 @@ static const struct firmware card_fw[] = { {0, "layla20_asic.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x1801 ,0xECC0 ,0x0030 ,0 ,0 ,0 },/* DSP 56301 Layla20 rev.0 */ {0x1057 ,0x1801 ,0xECC0 ,0x0031 ,0 ,0 ,0 },/* DSP 56301 Layla20 rev.1 */ {0 ,}
sound/pci/echoaudio/layla24.c +1 -1
@@ -87,7 +87,7 @@ static const struct firmware card_fw[] = { {0, "layla24_2S_asic.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x3410 ,0xECC0 ,0x0060 ,0 ,0 ,0 },/* DSP 56361 Layla24 rev.0 */ {0 ,} };
sound/pci/echoaudio/mia.c +1 -1
@@ -77,7 +77,7 @@ static const struct firmware card_fw[] = { {0, "mia_dsp.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x3410 ,0xECC0 ,0x0080 ,0 ,0 ,0 },/* DSP 56361 Mia rev.0 */ {0x1057 ,0x3410 ,0xECC0 ,0x0081 ,0 ,0 ,0 },/* DSP 56361 Mia rev.1 */ {0 ,}
sound/pci/echoaudio/mona.c +1 -1
@@ -92,7 +92,7 @@ static const struct firmware card_fw[] = { {0, "mona_2_asic.fw"} }; -static DEFINE_PCI_DEVICE_TABLE (snd_echo_ids) = { +static const struct pci_device_id snd_echo_ids[] = { {0x1057 ,0x1801 ,0xECC0 ,0x0070 ,0 ,0 ,0 },/* DSP 56301 Mona rev.0 */ {0x1057 ,0x1801 ,0xECC0 ,0x0071 ,0 ,0 ,0 },/* DSP 56301 Mona rev.1 */ {0x1057 ,0x1801 ,0xECC0 ,0x0072 ,0 ,0 ,0 },/* DSP 56301 Mona rev.2 */
sound/pci/emu10k1/emu10k1.c +1 -1
@@ -79,7 +79,7 @@ MODULE_PARM_DESC(delay_pcm_irq, "Delay PCM interrupt by specified number of samp/* * Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value Model:SB0400 */ -static DEFINE_PCI_DEVICE_TABLE (snd_emu10k1_ids) = { +static const struct pci_device_id snd_emu10k1_ids[] = { {PCI_VDEVICE (CREATIVE ,0x0002 ),0 },/* EMU10K1 */ {PCI_VDEVICE (CREATIVE ,0x0004 ),1 },/* Audigy */ {PCI_VDEVICE (CREATIVE ,0x0008 ),1 },/* Audigy 2 Value SB0400 */
sound/pci/emu10k1/emu10k1x.c +1 -1
@@ -1634,7 +1634,7 @@ static void snd_emu10k1x_remove(struct pci_dev *pci) }// PCI IDs -static DEFINE_PCI_DEVICE_TABLE (snd_emu10k1x_ids) = { +static const struct pci_device_id snd_emu10k1x_ids[] = { {PCI_VDEVICE (CREATIVE ,0x0006 ),0 },/* Dell OEM version (EMU10K1) */ {0 , } };
sound/pci/ens1370.c +1 -1
@@ -446,7 +446,7 @@ struct ensoniq {static irqreturn_t snd_audiopci_interrupt (int irq,void *dev_id); -static DEFINE_PCI_DEVICE_TABLE(snd_audiopci_ids) = { +static const struct pci_device_id snd_audiopci_ids[] = { #ifdef CHIP1370 {PCI_VDEVICE (ENSONIQ ,0x5000 ),0 , },/* ES1370 */ #endif
sound/pci/es1938.c +1 -1
@@ -243,7 +243,7 @@ struct es1938 {static irqreturn_t snd_es1938_interrupt (int irq,void *dev_id); -static DEFINE_PCI_DEVICE_TABLE (snd_es1938_ids) = { +static const struct pci_device_id snd_es1938_ids[] = { {PCI_VDEVICE (ESS ,0x1969 ),0 , },/* Solo-1 */ {0 , } };
sound/pci/es1968.c +1 -1
@@ -570,7 +570,7 @@ struct es1968 {static irqreturn_t snd_es1968_interrupt (int irq,void *dev_id); -static DEFINE_PCI_DEVICE_TABLE (snd_es1968_ids) = { +static const struct pci_device_id snd_es1968_ids[] = {/* Maestro 1 */ {0x1285 ,0x0100 ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_CLASS_MULTIMEDIA_AUDIO <<8 ,0xffff00 ,TYPE_MAESTRO },/* Maestro 2 */
sound/pci/fm801.c +1 -1
@@ -218,7 +218,7 @@ struct fm801 {#endif }; -static DEFINE_PCI_DEVICE_TABLE (snd_fm801_ids) = { +static const struct pci_device_id snd_fm801_ids[] = { {0x1319 ,0x0801 ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_CLASS_MULTIMEDIA_AUDIO <<8 ,0xffff00 ,0 , },/* FM801 */ {0x5213 ,0x0510 ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_CLASS_MULTIMEDIA_AUDIO <<8 ,0xffff00 ,0 , },/* Gallant Odyssey Sound 4 */ {0 , }
sound/pci/ice1712/ice1712.c +1 -1
@@ -105,7 +105,7 @@ module_param_array(dxr_enable, int, NULL, 0444);MODULE_PARM_DESC (dxr_enable,"Enable DXR support for Terratec DMX6FIRE." ); -static DEFINE_PCI_DEVICE_TABLE (snd_ice1712_ids) = { +static const struct pci_device_id snd_ice1712_ids[] = { {PCI_VDEVICE (ICE ,PCI_DEVICE_ID_ICE_1712 ),0 },/* ICE1712 */ {0 , } };
sound/pci/ice1712/ice1724.c +1 -1
@@ -94,7 +94,7 @@ MODULE_PARM_DESC(model, "Use the given board model.");/* Both VT1720 and VT1724 have the same PCI IDs */ -static DEFINE_PCI_DEVICE_TABLE (snd_vt1724_ids) = { +static const struct pci_device_id snd_vt1724_ids[] = { {PCI_VDEVICE (ICE ,PCI_DEVICE_ID_VT1724 ),0 }, {0 , } };
sound/pci/intel8x0.c +1 -1
@@ -430,7 +430,7 @@ struct intel8x0 {u32 int_sta_mask;/* interrupt status mask */ }; -static DEFINE_PCI_DEVICE_TABLE (snd_intel8x0_ids) = { +static const struct pci_device_id snd_intel8x0_ids[] = { {PCI_VDEVICE (INTEL ,0x2415 ),DEVICE_INTEL },/* 82801AA */ {PCI_VDEVICE (INTEL ,0x2425 ),DEVICE_INTEL },/* 82901AB */ {PCI_VDEVICE (INTEL ,0x2445 ),DEVICE_INTEL },/* 82801BA */
sound/pci/intel8x0m.c +1 -1
@@ -219,7 +219,7 @@ struct intel8x0m {unsigned int pcm_pos_shift; }; -static DEFINE_PCI_DEVICE_TABLE (snd_intel8x0m_ids) = { +static const struct pci_device_id snd_intel8x0m_ids[] = { {PCI_VDEVICE (INTEL ,0x2416 ),DEVICE_INTEL },/* 82801AA */ {PCI_VDEVICE (INTEL ,0x2426 ),DEVICE_INTEL },/* 82901AB */ {PCI_VDEVICE (INTEL ,0x2446 ),DEVICE_INTEL },/* 82801BA */
sound/pci/korg1212/korg1212.c +1 -1
@@ -418,7 +418,7 @@ module_param_array(enable, bool, NULL, 0444);MODULE_PARM_DESC (enable,"Enable Korg 1212 soundcard." );MODULE_AUTHOR ("Haroldo Gamal <[email protected]>" ); -static DEFINE_PCI_DEVICE_TABLE (snd_korg1212_ids) = { +static const struct pci_device_id snd_korg1212_ids[] = { { .vendor =0x10b5 , .device =0x906d ,
sound/pci/lola/lola.c +1 -1
@@ -760,7 +760,7 @@ static void lola_remove(struct pci_dev *pci) }/* PCI IDs */ -static DEFINE_PCI_DEVICE_TABLE (lola_ids) = { +static const struct pci_device_id lola_ids[] = { {PCI_VDEVICE (DIGIGRAM ,0x0001 ) }, {0 , } };
sound/pci/lx6464es/lx6464es.c +1 -1
@@ -56,7 +56,7 @@ static const char card_name[] = "LX6464ES";#define PCI_DEVICE_ID_PLX_LX6464ES PCI_DEVICE_ID_PLX_9056 -static DEFINE_PCI_DEVICE_TABLE (snd_lx6464es_ids) = { +static const struct pci_device_id snd_lx6464es_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_PLX ,PCI_DEVICE_ID_PLX_LX6464ES ), .subvendor =PCI_VENDOR_ID_DIGIGRAM , .subdevice =PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM
sound/pci/maestro3.c +1 -1
@@ -800,7 +800,7 @@ struct snd_m3 {/* * pci ids */ -static DEFINE_PCI_DEVICE_TABLE (snd_m3_ids) = { +static const struct pci_device_id snd_m3_ids[] = { {PCI_VENDOR_ID_ESS ,PCI_DEVICE_ID_ESS_ALLEGRO_1 ,PCI_ANY_ID ,PCI_ANY_ID ,PCI_CLASS_MULTIMEDIA_AUDIO <<8 ,0xffff00 ,0 }, {PCI_VENDOR_ID_ESS ,PCI_DEVICE_ID_ESS_ALLEGRO ,PCI_ANY_ID ,PCI_ANY_ID ,
sound/pci/mixart/mixart.c +1 -1
@@ -61,7 +61,7 @@ MODULE_PARM_DESC(enable, "Enable Digigram " CARD_NAME " soundcard.");/* */ -static DEFINE_PCI_DEVICE_TABLE (snd_mixart_ids) = { +static const struct pci_device_id snd_mixart_ids[] = { {PCI_VDEVICE (MOTOROLA ,0x0003 ),0 , },/* MC8240 */ {0 , } };
sound/pci/nm256/nm256.c +1 -1
@@ -262,7 +262,7 @@ struct nm256 {/* * PCI ids */ -static DEFINE_PCI_DEVICE_TABLE (snd_nm256_ids) = { +static const struct pci_device_id snd_nm256_ids[] = { {PCI_VDEVICE (NEOMAGIC ,PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO ),0 }, {PCI_VDEVICE (NEOMAGIC ,PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO ),0 }, {PCI_VDEVICE (NEOMAGIC ,PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO ),0 },
sound/pci/oxygen/oxygen.c +1 -1
@@ -97,7 +97,7 @@ enum { MODEL_XONAR_DGX, }; -static DEFINE_PCI_DEVICE_TABLE (oxygen_ids) = { +static const struct pci_device_id oxygen_ids[] = {/* C-Media's reference design */ {OXYGEN_PCI_SUBID (0x10b0 ,0x0216 ), .driver_data =MODEL_CMEDIA_REF }, {OXYGEN_PCI_SUBID (0x10b0 ,0x0217 ), .driver_data =MODEL_CMEDIA_REF },
sound/pci/oxygen/virtuoso.c +1 -1
@@ -41,7 +41,7 @@ MODULE_PARM_DESC(id, "ID string");module_param_array (enable, bool,NULL ,0444 );MODULE_PARM_DESC (enable,"enable card" ); -static DEFINE_PCI_DEVICE_TABLE (xonar_ids) = { +static const struct pci_device_id xonar_ids[] = { {OXYGEN_PCI_SUBID (0x1043 ,0x8269 ) }, {OXYGEN_PCI_SUBID (0x1043 ,0x8275 ) }, {OXYGEN_PCI_SUBID (0x1043 ,0x82b7 ) },
sound/pci/pcxhr/pcxhr.c +1 -1
@@ -102,7 +102,7 @@ enum {PCI_ID_LAST }; -static DEFINE_PCI_DEVICE_TABLE (pcxhr_ids) = { +static const struct pci_device_id pcxhr_ids[] = { {0x10b5 ,0x9656 ,0x1369 ,0xb001 ,0 ,0 ,PCI_ID_VX882HR , }, {0x10b5 ,0x9656 ,0x1369 ,0xb101 ,0 ,0 ,PCI_ID_PCX882HR , }, {0x10b5 ,0x9656 ,0x1369 ,0xb201 ,0 ,0 ,PCI_ID_VX881HR , },
sound/pci/riptide/riptide.c +2 -2
@@ -508,7 +508,7 @@ static int riptide_reset(struct cmdif *cif, struct snd_riptide *chip);/* */ -static DEFINE_PCI_DEVICE_TABLE (snd_riptide_ids) = { +static const struct pci_device_id snd_riptide_ids[] = { {PCI_DEVICE (0x127a ,0x4310 ) }, {PCI_DEVICE (0x127a ,0x4320 ) }, {PCI_DEVICE (0x127a ,0x4330 ) },
@@ -517,7 +517,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_riptide_ids) = { };#ifdef SUPPORT_JOYSTICK -static DEFINE_PCI_DEVICE_TABLE (snd_riptide_joystick_ids) = { +static const struct pci_device_id snd_riptide_joystick_ids[] = { {PCI_DEVICE (0x127a ,0x4312 ) }, {PCI_DEVICE (0x127a ,0x4322 ) }, { PCI_DEVICE(0x127a, 0x4332) },
sound/pci/rme32.c +1 -1
@@ -226,7 +226,7 @@ struct rme32 {struct snd_kcontrol *spdif_ctl; }; -static DEFINE_PCI_DEVICE_TABLE (snd_rme32_ids) = { +static const struct pci_device_id snd_rme32_ids[] = { {PCI_VDEVICE (XILINX_RME ,PCI_DEVICE_ID_RME_DIGI32 ),0 ,}, {PCI_VDEVICE (XILINX_RME ,PCI_DEVICE_ID_RME_DIGI32_8 ),0 ,}, {PCI_VDEVICE (XILINX_RME ,PCI_DEVICE_ID_RME_DIGI32_PRO ),0 ,},
sound/pci/rme96.c +1 -1
@@ -263,7 +263,7 @@ struct rme96 {struct snd_kcontrol *spdif_ctl; }; -static DEFINE_PCI_DEVICE_TABLE (snd_rme96_ids) = { +static const struct pci_device_id snd_rme96_ids[] = { {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_RME_DIGI96 ),0 , }, {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_RME_DIGI96_8 ),0 , }, {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_RME_DIGI96_8_PRO ),0 , },
sound/pci/rme9652/hdsp.c +1 -1
@@ -597,7 +597,7 @@ static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_d } -static DEFINE_PCI_DEVICE_TABLE (snd_hdsp_ids) = { +static const struct pci_device_id snd_hdsp_ids[] = { { .vendor =PCI_VENDOR_ID_XILINX , .device =PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP ,
sound/pci/rme9652/hdspm.c +1 -1
@@ -1077,7 +1077,7 @@ struct hdspm { }; -static DEFINE_PCI_DEVICE_TABLE (snd_hdspm_ids) = { +static const struct pci_device_id snd_hdspm_ids[] = { { .vendor =PCI_VENDOR_ID_XILINX , .device =PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI ,
sound/pci/rme9652/rme9652.c +1 -1
@@ -307,7 +307,7 @@ static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_d } -static DEFINE_PCI_DEVICE_TABLE (snd_rme9652_ids) = { +static const struct pci_device_id snd_rme9652_ids[] = { { .vendor =0x10ee , .device =0x3fc4 ,
sound/pci/sis7019.c +1 -1
@@ -52,7 +52,7 @@ MODULE_PARM_DESC(enable, "Enable SiS7019 Audio Accelerator.");module_param (codecs, int,0444 );MODULE_PARM_DESC (codecs,"Set bit to indicate that codec number is expected to be present (default 1)" ); -static DEFINE_PCI_DEVICE_TABLE (snd_sis7019_ids) = { +static const struct pci_device_id snd_sis7019_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_SI ,0x7019 ) }, {0 , } };
sound/pci/sonicvibes.c +1 -1
@@ -242,7 +242,7 @@ struct sonicvibes {#endif }; -static DEFINE_PCI_DEVICE_TABLE (snd_sonic_ids) = { +static const struct pci_device_id snd_sonic_ids[] = { {PCI_VDEVICE (S3 ,0xca00 ),0 , }, {0 , } };
sound/pci/trident/trident.c +1 -1
@@ -62,7 +62,7 @@ MODULE_PARM_DESC(pcm_channels, "Number of hardware channels assigned for PCM.");module_param_array (wavetable_size, int,NULL ,0444 );MODULE_PARM_DESC (wavetable_size,"Maximum memory size in kB for wavetable synth." ); -static DEFINE_PCI_DEVICE_TABLE (snd_trident_ids) = { +static const struct pci_device_id snd_trident_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_TRIDENT ,PCI_DEVICE_ID_TRIDENT_4DWAVE_DX ),PCI_CLASS_MULTIMEDIA_AUDIO <<8 ,0xffff00 ,0 }, {PCI_DEVICE (PCI_VENDOR_ID_TRIDENT ,PCI_DEVICE_ID_TRIDENT_4DWAVE_NX ),
sound/pci/via82xx.c +1 -1
@@ -404,7 +404,7 @@ struct via82xx {#endif }; -static DEFINE_PCI_DEVICE_TABLE (snd_via82xx_ids) = { +static const struct pci_device_id snd_via82xx_ids[] = {/* 0x1106, 0x3058 */ {PCI_VDEVICE (VIA ,PCI_DEVICE_ID_VIA_82C686_5 ),TYPE_CARD_VIA686 , },/* 686A */ /* 0x1106, 0x3059 */
sound/pci/via82xx_modem.c +1 -1
@@ -260,7 +260,7 @@ struct via82xx_modem {struct snd_info_entry *proc_entry; }; -static DEFINE_PCI_DEVICE_TABLE (snd_via82xx_modem_ids) = { +static const struct pci_device_id snd_via82xx_modem_ids[] = { {PCI_VDEVICE (VIA ,0x3068 ),TYPE_CARD_VIA82XX_MODEM , }, {0 , } };
sound/pci/vx222/vx222.c +1 -1
@@ -60,7 +60,7 @@ enum {VX_PCI_VX222_NEW }; -static DEFINE_PCI_DEVICE_TABLE (snd_vx222_ids) = { +static const struct pci_device_id snd_vx222_ids[] = { {0x10b5 ,0x9050 ,0x1369 ,PCI_ANY_ID ,0 ,0 ,VX_PCI_VX222_OLD , },/* PLX */ {0x10b5 ,0x9030 ,0x1369 ,PCI_ANY_ID ,0 ,0 ,VX_PCI_VX222_NEW , },/* PLX */ {0 , }
sound/pci/ymfpci/ymfpci.c +1 -1
@@ -66,7 +66,7 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address");module_param_array (rear_switch, bool,NULL ,0444 );MODULE_PARM_DESC (rear_switch,"Enable shared rear/line-in switch" ); -static DEFINE_PCI_DEVICE_TABLE (snd_ymfpci_ids) = { +static const struct pci_device_id snd_ymfpci_ids[] = { {PCI_VDEVICE (YAMAHA ,0x0004 ),0 , },/* YMF724 */ {PCI_VDEVICE (YAMAHA ,0x000d ),0 , },/* YMF724F */ {PCI_VDEVICE (YAMAHA ,0x000a ),0 , },/* YMF740 */
Quoted 21 lines · Benoit Taine
We should prefer
const struct pci_device_idoverDEFINE_PCI_DEVICE_TABLEto 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 nameDEFINE_PCI_DEVICE_TABLE;
initializer z;
@@-
DEFINE_PCI_DEVICE_TABLE(i)
+ const structpci_device_idi[]
= z;// </smpl>
Quoted 8 lines
I previously sent parts of this patch to check wether or not it was worth sending, and Bjorn answered:
Quoted 4 lines
Benoit, how about if you wait until about half-way through the merge window after v3.16 releases, generate an up-to-date single patch, and post that? Then we can try to get it in before v3.17-rc1 to minimize merge hassles.
So here it is, based on linux-next on 2014-08-07.
Applied to my for-linus branch for v3.17, thanks!
Bjorn