Re: [PATCH net-next] net: Consistently define pci_device_ids using named initializers

[Jijie Shao <shaojijie@huawei.com>]

on 2026/4/29 1:18, Uwe Kleine-König (The Capable Hub) wrote:
> ... and PCI device helpers.
>
> The various struct pci_device_id arrays were initialized mostly by one
> the PCI_DEVICE macros and then list expressions. The latter isn't easily
> readable if you're not into PCI. Using named initializers is more
> explicit and thus easier to parse.
>
> Also use PCI_DEVICE* helper macros to assign .vendor, .device,
> .subvendor and .subdevice where appropriate and skip explicit
> assignments of 0 (which the compiler takes care of).
>
> The secret plan is to make struct pci_device_id::driver_data an
> anonymous union (similar to
> https://lore.kernel.org/all/cover.1776579304.git.u.kleine-koenig@baylibre.com/)
> and that requires named initializers. But it's also a nice cleanup on
> its own.
>
> This change doesn't introduce changes to the compiled pci_device_id
> arrays. Tested on x86 and arm64.
>
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>

...

>   
> diff --git a/drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c b/drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c
> index 068da2fd1fea..b3e01b2f8319 100644
> --- a/drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c
> +++ b/drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c
> @@ -489,7 +489,7 @@ static void hbg_shutdown(struct pci_dev *pdev)
>   }
>   
>   static const struct pci_device_id hbg_pci_tbl[] = {
> -	{PCI_VDEVICE(HUAWEI, 0x3730), 0},
> +	{ PCI_VDEVICE(HUAWEI, 0x3730) },
>   	{ }
>   };

Reviewed-by: Jijie Shao <shaojijie@huawei.com>

>   MODULE_DEVICE_TABLE(pci, hbg_pci_tbl);
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> index a3206c97923e..4c34a144d21c 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> @@ -86,25 +86,39 @@ module_param(page_pool_enabled, bool, 0400);
>    *   Class, Class Mask, private data (not used) }
>    */
>   static const struct pci_device_id hns3_pci_tbl[] = {
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_GE), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE_RDMA),
> -	 HNAE3_DEV_SUPPORT_ROCE_DCB_BITS},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE_RDMA_MACSEC),
> -	 HNAE3_DEV_SUPPORT_ROCE_DCB_BITS},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_50GE_RDMA),
> -	 HNAE3_DEV_SUPPORT_ROCE_DCB_BITS},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_50GE_RDMA_MACSEC),
> -	 HNAE3_DEV_SUPPORT_ROCE_DCB_BITS},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_100G_RDMA_MACSEC),
> -	 HNAE3_DEV_SUPPORT_ROCE_DCB_BITS},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_200G_RDMA),
> -	 HNAE3_DEV_SUPPORT_ROCE_DCB_BITS},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_VF), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_RDMA_DCB_PFC_VF),
> -	 HNAE3_DEV_SUPPORT_ROCE_DCB_BITS},
> +	{
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_GE),
> +		.driver_data = 0,
> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE),
> +		.driver_data = 0,

Thanks for your work.

If .driver_data = 0, is it possible to delete it to be consistent with other parts, for example:

{ PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_GE) }

Jijie Shao


> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE_RDMA),
> +		.driver_data = HNAE3_DEV_SUPPORT_ROCE_DCB_BITS,
> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE_RDMA_MACSEC),
> +		.driver_data = HNAE3_DEV_SUPPORT_ROCE_DCB_BITS,
> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_50GE_RDMA),
> +		.driver_data = HNAE3_DEV_SUPPORT_ROCE_DCB_BITS,
> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_50GE_RDMA_MACSEC),
> +		.driver_data = HNAE3_DEV_SUPPORT_ROCE_DCB_BITS,
> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_100G_RDMA_MACSEC),
> +		.driver_data = HNAE3_DEV_SUPPORT_ROCE_DCB_BITS,
> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_200G_RDMA),
> +		.driver_data = HNAE3_DEV_SUPPORT_ROCE_DCB_BITS,
> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_VF),
> +		.driver_data = 0,
> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_RDMA_DCB_PFC_VF),
> +		.driver_data = HNAE3_DEV_SUPPORT_ROCE_DCB_BITS,
> +	},
>   	/* required last entry */
> -	{0,}
> +	{ }
>   };
>   MODULE_DEVICE_TABLE(pci, hns3_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> index dd4045c773d4..e17b92a411a2 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> @@ -72,16 +72,16 @@ static struct hnae3_ae_algo ae_algo;
>   static struct workqueue_struct *hclge_wq;
>   
>   static const struct pci_device_id ae_algo_pci_tbl[] = {
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_GE), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE_RDMA), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE_RDMA_MACSEC), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_50GE_RDMA), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_50GE_RDMA_MACSEC), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_100G_RDMA_MACSEC), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_200G_RDMA), 0},
> +	{ PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_GE) },
> +	{ PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE) },
> +	{ PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE_RDMA) },
> +	{ PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_25GE_RDMA_MACSEC) },
> +	{ PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_50GE_RDMA) },
> +	{ PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_50GE_RDMA_MACSEC) },
> +	{ PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_100G_RDMA_MACSEC) },
> +	{ PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_200G_RDMA) },
>   	/* required last entry */
> -	{0, }
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, ae_algo_pci_tbl);
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
> index 0cc911e6c732..063a692c2b41 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
> @@ -26,11 +26,15 @@ static struct hnae3_ae_algo ae_algovf;
>   static struct workqueue_struct *hclgevf_wq;
>   
>   static const struct pci_device_id ae_algovf_pci_tbl[] = {
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_VF), 0},
> -	{PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_RDMA_DCB_PFC_VF),
> -	 HNAE3_DEV_SUPPORT_ROCE_DCB_BITS},
> +	{
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_VF),
> +		.driver_data = 0,
> +	}, {
> +		PCI_VDEVICE(HUAWEI, HNAE3_DEV_ID_RDMA_DCB_PFC_VF),
> +		.driver_data = HNAE3_DEV_SUPPORT_ROCE_DCB_BITS,
> +	},
>   	/* required last entry */
> -	{0, }
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, ae_algovf_pci_tbl);
> diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c
> index ae1f523d6841..42f4792d255b 100644
> --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c
> +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c
> @@ -1467,12 +1467,12 @@ static void hinic_shutdown(struct pci_dev *pdev)
>   }
>   
>   static const struct pci_device_id hinic_pci_table[] = {
> -	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_QUAD_PORT_25GE), 0},
> -	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_DUAL_PORT_100GE), 0},
> -	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_DUAL_PORT_100GE_MEZZ), 0},
> -	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_QUAD_PORT_25GE_MEZZ), 0},
> -	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_VF), 0},
> -	{ 0, 0}
> +	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_QUAD_PORT_25GE) },
> +	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_DUAL_PORT_100GE) },
> +	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_DUAL_PORT_100GE_MEZZ) },
> +	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_QUAD_PORT_25GE_MEZZ) },
> +	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_VF) },
> +	{ }
>   };
>   MODULE_DEVICE_TABLE(pci, hinic_pci_table);
>   
> diff --git a/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c b/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
> index f83d5bd1041e..36df807cbe09 100644
> --- a/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
> +++ b/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
> @@ -426,10 +426,9 @@ static void hinic3_remove(struct pci_dev *pdev)
>   }
>   
>   static const struct pci_device_id hinic3_pci_table[] = {
> -	{PCI_VDEVICE(HUAWEI, PCI_DEV_ID_HINIC3_PF), 0},
> -	{PCI_VDEVICE(HUAWEI, PCI_DEV_ID_HINIC3_VF), 0},
> -	{0, 0}
> -
> +	{ PCI_VDEVICE(HUAWEI, PCI_DEV_ID_HINIC3_PF) },
> +	{ PCI_VDEVICE(HUAWEI, PCI_DEV_ID_HINIC3_VF) },
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, hinic3_pci_table);
> diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
> index 9074b558de35..5ef82a4e6184 100644
> --- a/drivers/net/ethernet/intel/e100.c
> +++ b/drivers/net/ethernet/intel/e100.c
> @@ -177,8 +177,8 @@ MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums");
>   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 }
> +	PCI_VDEVICE(INTEL, device_id), \
> +	.class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = 0xFFFF00, .driver_data = ich }
>   static const struct pci_device_id e100_id_table[] = {
>   	INTEL_8255X_ETHERNET_DEVICE(0x1029, 0),
>   	INTEL_8255X_ETHERNET_DEVICE(0x1030, 0),
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index 7ce0cc8ab8f4..5b7ba1594f0d 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -7799,137 +7799,370 @@ static const struct pci_error_handlers e1000_err_handler = {
>   };
>   
>   static const struct pci_device_id e1000_pci_tbl[] = {
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_COPPER), board_82571 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_FIBER), board_82571 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER), board_82571 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER_LP),
> -	  board_82571 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_FIBER), board_82571 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES), board_82571 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_DUAL), board_82571 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_QUAD), board_82571 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571PT_QUAD_COPPER), board_82571 },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_COPPER),
> +		.driver_data = board_82571,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_FIBER),
> +		.driver_data = board_82571,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER),
> +		.driver_data = board_82571,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER_LP),
> +		.driver_data = board_82571,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_FIBER),
> +		.driver_data = board_82571,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES),
> +		.driver_data = board_82571,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_DUAL),
> +		.driver_data = board_82571,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_SERDES_QUAD),
> +		.driver_data = board_82571,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82571PT_QUAD_COPPER),
> +		.driver_data = board_82571,
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI), board_82572 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_COPPER), board_82572 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_FIBER), board_82572 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_SERDES), board_82572 },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI),
> +		.driver_data = board_82572,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_COPPER),
> +		.driver_data = board_82572,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_FIBER),
> +		.driver_data = board_82572,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82572EI_SERDES),
> +		.driver_data = board_82572,
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E), board_82573 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E_IAMT), board_82573 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82573L), board_82573 },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E),
> +		.driver_data = board_82573,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82573E_IAMT),
> +		.driver_data = board_82573,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82573L),
> +		.driver_data = board_82573,
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82574L), board_82574 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82574LA), board_82574 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82583V), board_82583 },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82574L),
> +		.driver_data = board_82574,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82574LA),
> +		.driver_data = board_82574,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_82583V),
> +		.driver_data = board_82583,
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_DPT),
> -	  board_80003es2lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_SPT),
> -	  board_80003es2lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_SERDES_DPT),
> -	  board_80003es2lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_SERDES_SPT),
> -	  board_80003es2lan },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_DPT),
> +		.driver_data = board_80003es2lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_COPPER_SPT),
> +		.driver_data = board_80003es2lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_SERDES_DPT),
> +		.driver_data = board_80003es2lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_80003ES2LAN_SERDES_SPT),
> +		.driver_data = board_80003es2lan,
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE), board_ich8lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_G), board_ich8lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_GT), board_ich8lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_AMT), board_ich8lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_C), board_ich8lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M), board_ich8lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M_AMT), board_ich8lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_82567V_3), board_ich8lan },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE),
> +		.driver_data = board_ich8lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_G),
> +		.driver_data = board_ich8lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IFE_GT),
> +		.driver_data = board_ich8lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_AMT),
> +		.driver_data = board_ich8lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_C),
> +		.driver_data = board_ich8lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M),
> +		.driver_data = board_ich8lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_IGP_M_AMT),
> +		.driver_data = board_ich8lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH8_82567V_3),
> +		.driver_data = board_ich8lan,
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_G),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V),
> +		.driver_data = board_ich9lan
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_V), board_ich9lan },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF),
> +		.driver_data = board_ich9lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_V),
> +		.driver_data = board_ich9lan,
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LM), board_ich10lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LF), board_ich10lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_V), board_ich10lan },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LM),
> +		.driver_data = board_ich10lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LF),
> +		.driver_data = board_ich10lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_V),
> +		.driver_data = board_ich10lan,
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LM), board_pchlan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LC), board_pchlan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DM), board_pchlan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DC), board_pchlan },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LM),
> +		.driver_data = board_pchlan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LC),
> +		.driver_data = board_pchlan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DM),
> +		.driver_data = board_pchlan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_D_HV_DC),
> +		.driver_data = board_pchlan
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM),
> +		.driver_data = board_pch2lan,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V),
> +		.driver_data = board_pch2lan
> +	},
>   
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_LM), board_pch_lpt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_V), board_pch_lpt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPTLP_I218_LM), board_pch_lpt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPTLP_I218_V), board_pch_lpt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_I218_LM2), board_pch_lpt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_I218_V2), board_pch_lpt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_I218_LM3), board_pch_lpt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_I218_V3), board_pch_lpt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM2), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V2), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LBG_I219_LM3), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM4), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V4), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM5), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V5), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_LM6), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_V6), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_LM7), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_V7), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_LM8), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_V8), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_LM9), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_V9), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM10), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V10), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM11), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V11), board_pch_cnp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM12), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V12), board_pch_spt },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM13), board_pch_tgp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V13), board_pch_tgp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM14), board_pch_tgp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_tgp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_tgp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V15), board_pch_tgp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM23), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V23), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM19), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V19), board_pch_adp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_mtp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_mtp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_mtp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_mtp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_mtp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21), board_pch_mtp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ARL_I219_LM24), board_pch_mtp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ARL_I219_V24), board_pch_mtp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_PTP_I219_LM25), board_pch_ptp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_PTP_I219_V25), board_pch_ptp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_PTP_I219_LM27), board_pch_ptp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_PTP_I219_V27), board_pch_ptp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_NVL_I219_LM29), board_pch_ptp },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_NVL_I219_V29), board_pch_ptp },
> +	{
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_LM),
> +		.driver_data = board_pch_lpt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_V),
> +		.driver_data = board_pch_lpt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPTLP_I218_LM),
> +		.driver_data = board_pch_lpt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPTLP_I218_V),
> +		.driver_data = board_pch_lpt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_I218_LM2),
> +		.driver_data = board_pch_lpt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_I218_V2),
> +		.driver_data = board_pch_lpt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_I218_LM3),
> +		.driver_data = board_pch_lpt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_I218_V3),
> +		.driver_data = board_pch_lpt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM2),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V2),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LBG_I219_LM3),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM4),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V4),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_LM5),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_SPT_I219_V5),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_LM6),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_V6),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_LM7),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CNP_I219_V7),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_LM8),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_V8),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_LM9),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ICP_I219_V9),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM10),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V10),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM11),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V11),
> +		.driver_data = board_pch_cnp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_LM12),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_CMP_I219_V12),
> +		.driver_data = board_pch_spt,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM13),
> +		.driver_data = board_pch_tgp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V13),
> +		.driver_data = board_pch_tgp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM14),
> +		.driver_data = board_pch_tgp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14),
> +		.driver_data = board_pch_tgp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15),
> +		.driver_data = board_pch_tgp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V15),
> +		.driver_data = board_pch_tgp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM23),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V23),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM19),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V19),
> +		.driver_data = board_pch_adp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18),
> +		.driver_data = board_pch_mtp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18),
> +		.driver_data = board_pch_mtp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20),
> +		.driver_data = board_pch_mtp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20),
> +		.driver_data = board_pch_mtp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21),
> +		.driver_data = board_pch_mtp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21),
> +		.driver_data = board_pch_mtp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ARL_I219_LM24),
> +		.driver_data = board_pch_mtp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ARL_I219_V24),
> +		.driver_data = board_pch_mtp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_PTP_I219_LM25),
> +		.driver_data = board_pch_ptp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_PTP_I219_V25),
> +		.driver_data = board_pch_ptp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_PTP_I219_LM27),
> +		.driver_data = board_pch_ptp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_PTP_I219_V27),
> +		.driver_data = board_pch_ptp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_NVL_I219_LM29),
> +		.driver_data = board_pch_ptp,
> +	}, {
> +		PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_NVL_I219_V29),
> +		.driver_data = board_pch_ptp
> +	},
>   
> -	{ 0, 0, 0, 0, 0, 0, 0 }	/* terminate list */
> +	{ }	/* terminate list */
>   };
>   MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> index d75b8a50413d..f5b4d062709a 100644
> --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> @@ -21,12 +21,12 @@ static const struct fm10k_info *fm10k_info_tbl[] = {
>    *   Class, Class Mask, private data (not used) }
>    */
>   static const struct pci_device_id fm10k_pci_tbl[] = {
> -	{ PCI_VDEVICE(INTEL, FM10K_DEV_ID_PF), fm10k_device_pf },
> -	{ PCI_VDEVICE(INTEL, FM10K_DEV_ID_SDI_FM10420_QDA2), fm10k_device_pf },
> -	{ PCI_VDEVICE(INTEL, FM10K_DEV_ID_SDI_FM10420_DA2), fm10k_device_pf },
> -	{ PCI_VDEVICE(INTEL, FM10K_DEV_ID_VF), fm10k_device_vf },
> +	{ PCI_VDEVICE(INTEL, FM10K_DEV_ID_PF), .driver_data = fm10k_device_pf },
> +	{ PCI_VDEVICE(INTEL, FM10K_DEV_ID_SDI_FM10420_QDA2), .driver_data = fm10k_device_pf },
> +	{ PCI_VDEVICE(INTEL, FM10K_DEV_ID_SDI_FM10420_DA2), .driver_data = fm10k_device_pf },
> +	{ PCI_VDEVICE(INTEL, FM10K_DEV_ID_VF), .driver_data = fm10k_device_vf },
>   	/* required last entry */
> -	{ 0, }
> +	{ }
>   };
>   MODULE_DEVICE_TABLE(pci, fm10k_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index 028bd500603a..93faada2d328 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -63,40 +63,43 @@ static bool i40e_is_total_port_shutdown_enabled(struct i40e_pf *pf);
>    *   Class, Class Mask, private data (not used) }
>    */
>   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_B), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_C), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_A), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_B), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_BC), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T4), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_BC), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_SFP), 0},
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_XL710) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_QEMU) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_B) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_C) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_A) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_B) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_BC) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T4) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_BC) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_SFP) },
>   	/*
>   	 * This ID conflicts with ipw2200, but the devices can be differentiated
>   	 * because i40e devices use PCI_CLASS_NETWORK_ETHERNET and ipw2200
>   	 * devices use PCI_CLASS_NETWORK_OTHER.
>   	 */
> -	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_10G_B),
> -		PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_X722), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_X722), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_X722), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_X722), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_I_X722), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722_A), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2_A), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_X710_N3000), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_XXV710_N3000), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_25G_B), 0},
> -	{PCI_VDEVICE(INTEL, I40E_DEV_ID_25G_SFP28), 0},
> +	{
> +		PCI_DEVICE(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_10G_B),
> +		.class = PCI_CLASS_NETWORK_ETHERNET << 8,
> +		.class_mask = 0xffff00,
> +	},
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_X722) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_X722) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_X722) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_X722) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_I_X722) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722_A) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2_A) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_X710_N3000) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_XXV710_N3000) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_25G_B) },
> +	{ PCI_VDEVICE(INTEL, I40E_DEV_ID_25G_SFP28) },
>   	/* required last entry */
> -	{0, }
> +	{ }
>   };
>   MODULE_DEVICE_TABLE(pci, i40e_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
> index 3c1465cf0515..f00692f1e459 100644
> --- a/drivers/net/ethernet/intel/iavf/iavf_main.c
> +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
> @@ -36,12 +36,12 @@ static const char iavf_copyright[] =
>    *   Class, Class Mask, private data (not used) }
>    */
>   static const struct pci_device_id iavf_pci_tbl[] = {
> -	{PCI_VDEVICE(INTEL, IAVF_DEV_ID_VF), 0},
> -	{PCI_VDEVICE(INTEL, IAVF_DEV_ID_VF_HV), 0},
> -	{PCI_VDEVICE(INTEL, IAVF_DEV_ID_X722_VF), 0},
> -	{PCI_VDEVICE(INTEL, IAVF_DEV_ID_ADAPTIVE_VF), 0},
> +	{ PCI_VDEVICE(INTEL, IAVF_DEV_ID_VF) },
> +	{ PCI_VDEVICE(INTEL, IAVF_DEV_ID_VF_HV) },
> +	{ PCI_VDEVICE(INTEL, IAVF_DEV_ID_X722_VF) },
> +	{ PCI_VDEVICE(INTEL, IAVF_DEV_ID_ADAPTIVE_VF) },
>   	/* required last entry */
> -	{0, }
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, iavf_pci_tbl);
> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
> index ce91dda00ec0..49d46670695f 100644
> --- a/drivers/net/ethernet/intel/igb/igb_main.c
> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
> @@ -63,40 +63,40 @@ static const struct pci_device_id igb_pci_tbl[] = {
>   	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) },
>   	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) },
>   	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I211_COPPER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_FIBER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SGMII), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER_FLASHLESS), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES_FLASHLESS), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_COPPER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_FIBER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SERDES), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SGMII), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_FIBER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_QUAD_FIBER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SERDES), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SGMII), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SGMII), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SERDES), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_BACKPLANE), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SFP), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS_SERDES), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES_QUAD), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER_ET2), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 },
> -	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I211_COPPER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_FIBER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SGMII), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER_FLASHLESS), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES_FLASHLESS), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_COPPER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_FIBER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SERDES), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SGMII), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_FIBER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_QUAD_FIBER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SERDES), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SGMII), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SGMII), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SERDES), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_BACKPLANE), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SFP), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS_SERDES), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES_QUAD), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER_ET2), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), .driver_data = board_82575 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), .driver_data = board_82575 },
>   	/* required last entry */
> -	{0, }
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, igb_pci_tbl);
> diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
> index 5d04541072b3..0a3d0a1cba43 100644
> --- a/drivers/net/ethernet/intel/igbvf/netdev.c
> +++ b/drivers/net/ethernet/intel/igbvf/netdev.c
> @@ -2937,8 +2937,8 @@ static const struct pci_error_handlers igbvf_err_handler = {
>   };
>   
>   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 },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_VF), .driver_data = board_vf },
> +	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_VF), .driver_data = board_i350_vf },
>   	{ } /* terminate list */
>   };
>   MODULE_DEVICE_TABLE(pci, igbvf_pci_tbl);
> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
> index 8ac16808023c..89b9e1d00fc7 100644
> --- a/drivers/net/ethernet/intel/igc/igc_main.c
> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
> @@ -47,24 +47,24 @@ static const struct igc_info *igc_info_tbl[] = {
>   };
>   
>   static const struct pci_device_id igc_pci_tbl[] = {
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_LM), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_V), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_I), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I220_V), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_K), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_K2), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_K), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_LMVP), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_LMVP), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_IT), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_LM), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_V), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_IT), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I221_V), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_BLANK_NVM), board_base },
> -	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_BLANK_NVM), board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_LM), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_V), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_I), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I220_V), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_K), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_K2), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_K), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_LMVP), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_LMVP), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_IT), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_LM), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_V), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_IT), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I221_V), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I226_BLANK_NVM), .driver_data = board_base },
> +	{ PCI_VDEVICE(INTEL, IGC_DEV_ID_I225_BLANK_NVM), .driver_data = board_base },
>   	/* required last entry */
> -	{0, }
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, igc_pci_tbl);
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> index 2646ee6f295f..730a35658c76 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> @@ -88,60 +88,60 @@ static const struct ixgbe_info *ixgbe_info_tbl[] = {
>    *   Class, Class Mask, private data (not used) }
>    */
>   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 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT), board_82598 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT2), board_82598 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4), board_82598 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT), board_82598 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_DA_DUAL_PORT), board_82598 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM), board_82598 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_XF_LR), board_82598 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM), board_82598 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_BX), board_82598 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_EM), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_BACKPLANE_FCOE), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_FCOE), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_T3_LOM), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T), board_X540 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_QSFP_SF_QP), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), board_82599 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), board_X540 },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T), board_X550},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T1), board_X550},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KX4), board_X550EM_x},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_XFI), board_X550EM_x},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KR), board_X550EM_x},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_10G_T), board_X550EM_x},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_SFP), board_X550EM_x},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_1G_T), board_x550em_x_fw},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_KR), board_x550em_a },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_KR_L), board_x550em_a },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP_N), board_x550em_a },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII), board_x550em_a },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII_L), board_x550em_a },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_10G_T), board_x550em_a},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP), board_x550em_a },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_1G_T), board_x550em_a_fw },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_1G_T_L), board_x550em_a_fw },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_BACKPLANE), board_e610},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_SFP), board_e610},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_10G_T), board_e610},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_2_5G_T), board_e610},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_SGMII), board_e610},
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT2), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_DA_DUAL_PORT), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_XF_LR), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_BX), .driver_data = board_82598 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_EM), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_BACKPLANE_FCOE), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_FCOE), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_T3_LOM), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T), .driver_data = board_X540 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_QSFP_SF_QP), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), .driver_data = board_82599 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), .driver_data = board_X540 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T), .driver_data = board_X550 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T1), .driver_data = board_X550 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KX4), .driver_data = board_X550EM_x },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_XFI), .driver_data = board_X550EM_x },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KR), .driver_data = board_X550EM_x },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_10G_T), .driver_data = board_X550EM_x },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_SFP), .driver_data = board_X550EM_x },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_1G_T), .driver_data = board_x550em_x_fw },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_KR), .driver_data = board_x550em_a },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_KR_L), .driver_data = board_x550em_a },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP_N), .driver_data = board_x550em_a },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII), .driver_data = board_x550em_a },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII_L), .driver_data = board_x550em_a },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_10G_T), .driver_data = board_x550em_a },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP), .driver_data = board_x550em_a },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_1G_T), .driver_data = board_x550em_a_fw },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_1G_T_L), .driver_data = board_x550em_a_fw },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_BACKPLANE), .driver_data = board_e610 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_SFP), .driver_data = board_e610 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_10G_T), .driver_data = board_e610 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_2_5G_T), .driver_data = board_e610 },
> +	{ PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_SGMII), .driver_data = board_e610 },
>   	/* required last entry */
> -	{0, }
> +	{ }
>   };
>   MODULE_DEVICE_TABLE(pci, ixgbe_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> index 42f89a179a3f..b5d15c1f0d4f 100644
> --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> @@ -64,20 +64,43 @@ static const struct ixgbevf_info *ixgbevf_info_tbl[] = {
>    *   Class, Class Mask, private data (not used) }
>    */
>   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_82599_VF_HV), board_82599_vf_hv },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF), board_X540_vf },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF_HV), board_X540_vf_hv },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550_VF), board_X550_vf },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550_VF_HV), board_X550_vf_hv },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_VF), board_X550EM_x_vf },
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_VF_HV), board_X550EM_x_vf_hv},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_VF), board_x550em_a_vf },
> -	{PCI_VDEVICE_SUB(INTEL, IXGBE_DEV_ID_E610_VF, PCI_ANY_ID,
> -			 IXGBE_SUBDEV_ID_E610_VF_HV), board_e610_vf_hv},
> -	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_VF), board_e610_vf},
> +	{
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_VF),
> +		.driver_data = board_82599_vf,
> +	}, {
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_VF_HV),
> +		.driver_data = board_82599_vf_hv,
> +	}, {
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF),
> +		.driver_data = board_X540_vf,
> +	}, {
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540_VF_HV),
> +		.driver_data = board_X540_vf_hv,
> +	}, {
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550_VF),
> +		.driver_data = board_X550_vf,
> +	}, {
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550_VF_HV),
> +		.driver_data = board_X550_vf_hv,
> +	}, {
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_VF),
> +		.driver_data = board_X550EM_x_vf,
> +	}, {
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_VF_HV),
> +		.driver_data = board_X550EM_x_vf_hv
> +	}, {
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_VF),
> +		.driver_data = board_x550em_a_vf,
> +	}, {
> +		PCI_VDEVICE_SUB(INTEL, IXGBE_DEV_ID_E610_VF,
> +				PCI_ANY_ID, IXGBE_SUBDEV_ID_E610_VF_HV),
> +		.driver_data = board_e610_vf_hv,
> +	}, {
> +		PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_VF),
> +		.driver_data = board_e610_vf,
> +	},
>   	/* required last entry */
> -	{0, }
> +	{ }
>   };
>   MODULE_DEVICE_TABLE(pci, ixgbevf_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
> index e6b7e75894ff..4fe6dbf0942f 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
> @@ -4274,9 +4274,9 @@ int mlx4_restart_one(struct pci_dev *pdev)
>   	return mlx4_restart_one_up(pdev, false, NULL);
>   }
>   
> -#define MLX_SP(id) { PCI_VDEVICE(MELLANOX, id), MLX4_PCI_DEV_FORCE_SENSE_PORT }
> -#define MLX_VF(id) { PCI_VDEVICE(MELLANOX, id), MLX4_PCI_DEV_IS_VF }
> -#define MLX_GN(id) { PCI_VDEVICE(MELLANOX, id), 0 }
> +#define MLX_SP(id) { PCI_VDEVICE(MELLANOX, id), .driver_data = MLX4_PCI_DEV_FORCE_SENSE_PORT }
> +#define MLX_VF(id) { PCI_VDEVICE(MELLANOX, id), .driver_data = MLX4_PCI_DEV_IS_VF }
> +#define MLX_GN(id) { PCI_VDEVICE(MELLANOX, id), .driver_data = 0 }
>   
>   static const struct pci_device_id mlx4_pci_table[] = {
>   #ifdef CONFIG_MLX4_CORE_GEN2
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> index 74827e8ca125..ff450269ce37 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> @@ -2203,19 +2203,26 @@ static int mlx5_resume(struct pci_dev *pdev)
>   
>   static const struct pci_device_id mlx5_core_pci_table[] = {
>   	{ PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_CONNECTIB) },
> -	{ PCI_VDEVICE(MELLANOX, 0x1012), MLX5_PCI_DEV_IS_VF},	/* Connect-IB VF */
> +	{ PCI_VDEVICE(MELLANOX, 0x1012),
> +	  .driver_data = MLX5_PCI_DEV_IS_VF },			/* Connect-IB VF */
>   	{ PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_CONNECTX4) },
> -	{ PCI_VDEVICE(MELLANOX, 0x1014), MLX5_PCI_DEV_IS_VF},	/* ConnectX-4 VF */
> +	{ PCI_VDEVICE(MELLANOX, 0x1014),
> +	  .driver_data = MLX5_PCI_DEV_IS_VF },			/* ConnectX-4 VF */
>   	{ PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_CONNECTX4_LX) },
> -	{ PCI_VDEVICE(MELLANOX, 0x1016), MLX5_PCI_DEV_IS_VF},	/* ConnectX-4LX VF */
> +	{ PCI_VDEVICE(MELLANOX, 0x1016),
> +	  .driver_data = MLX5_PCI_DEV_IS_VF },			/* ConnectX-4LX VF */
>   	{ PCI_VDEVICE(MELLANOX, 0x1017) },			/* ConnectX-5, PCIe 3.0 */
> -	{ PCI_VDEVICE(MELLANOX, 0x1018), MLX5_PCI_DEV_IS_VF},	/* ConnectX-5 VF */
> +	{ PCI_VDEVICE(MELLANOX, 0x1018),
> +	  .driver_data = MLX5_PCI_DEV_IS_VF },			/* ConnectX-5 VF */
>   	{ PCI_VDEVICE(MELLANOX, 0x1019) },			/* ConnectX-5 Ex */
> -	{ PCI_VDEVICE(MELLANOX, 0x101a), MLX5_PCI_DEV_IS_VF},	/* ConnectX-5 Ex VF */
> +	{ PCI_VDEVICE(MELLANOX, 0x101a),
> +	  .driver_data = MLX5_PCI_DEV_IS_VF },			/* ConnectX-5 Ex VF */
>   	{ PCI_VDEVICE(MELLANOX, 0x101b) },			/* ConnectX-6 */
> -	{ PCI_VDEVICE(MELLANOX, 0x101c), MLX5_PCI_DEV_IS_VF},	/* ConnectX-6 VF */
> +	{ PCI_VDEVICE(MELLANOX, 0x101c),
> +	  .driver_data = MLX5_PCI_DEV_IS_VF },			/* ConnectX-6 VF */
>   	{ PCI_VDEVICE(MELLANOX, 0x101d) },			/* ConnectX-6 Dx */
> -	{ PCI_VDEVICE(MELLANOX, 0x101e), MLX5_PCI_DEV_IS_VF},	/* ConnectX Family mlx5Gen Virtual Function */
> +	{ PCI_VDEVICE(MELLANOX, 0x101e),
> +	  .driver_data = MLX5_PCI_DEV_IS_VF },			/* ConnectX Family mlx5Gen Virtual Function */
>   	{ PCI_VDEVICE(MELLANOX, 0x101f) },			/* ConnectX-6 LX */
>   	{ PCI_VDEVICE(MELLANOX, 0x1021) },			/* ConnectX-7 */
>   	{ PCI_VDEVICE(MELLANOX, 0x1023) },			/* ConnectX-8 */
> @@ -2223,11 +2230,12 @@ static const struct pci_device_id mlx5_core_pci_table[] = {
>   	{ PCI_VDEVICE(MELLANOX, 0x1027) },			/* ConnectX-10 */
>   	{ PCI_VDEVICE(MELLANOX, 0x2101) },			/* ConnectX-10 NVLink-C2C */
>   	{ PCI_VDEVICE(MELLANOX, 0xa2d2) },			/* BlueField integrated ConnectX-5 network controller */
> -	{ PCI_VDEVICE(MELLANOX, 0xa2d3), MLX5_PCI_DEV_IS_VF},	/* BlueField integrated ConnectX-5 network controller VF */
> +	{ PCI_VDEVICE(MELLANOX, 0xa2d3),
> +	  .driver_data = MLX5_PCI_DEV_IS_VF },			/* BlueField integrated ConnectX-5 network controller VF */
>   	{ PCI_VDEVICE(MELLANOX, 0xa2d6) },			/* BlueField-2 integrated ConnectX-6 Dx network controller */
>   	{ PCI_VDEVICE(MELLANOX, 0xa2dc) },			/* BlueField-3 integrated ConnectX-7 network controller */
>   	{ PCI_VDEVICE(MELLANOX, 0xa2df) },			/* BlueField-4 integrated ConnectX-8 network controller */
> -	{ 0, }
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, mlx5_core_pci_table);
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
> index 3a65420fa1ad..1aaa75b47fe3 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
> @@ -5277,8 +5277,8 @@ static int mlxsw_sp_netdevice_event(struct notifier_block *nb,
>   }
>   
>   static const struct pci_device_id mlxsw_sp1_pci_id_table[] = {
> -	{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM), 0},
> -	{0, },
> +	{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM) },
> +	{ },
>   };
>   
>   static struct pci_driver mlxsw_sp1_pci_driver = {
> @@ -5287,8 +5287,8 @@ static struct pci_driver mlxsw_sp1_pci_driver = {
>   };
>   
>   static const struct pci_device_id mlxsw_sp2_pci_id_table[] = {
> -	{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM2), 0},
> -	{0, },
> +	{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM2) },
> +	{ },
>   };
>   
>   static struct pci_driver mlxsw_sp2_pci_driver = {
> @@ -5297,8 +5297,8 @@ static struct pci_driver mlxsw_sp2_pci_driver = {
>   };
>   
>   static const struct pci_device_id mlxsw_sp3_pci_id_table[] = {
> -	{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM3), 0},
> -	{0, },
> +	{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM3) },
> +	{ },
>   };
>   
>   static struct pci_driver mlxsw_sp3_pci_driver = {
> @@ -5307,8 +5307,8 @@ static struct pci_driver mlxsw_sp3_pci_driver = {
>   };
>   
>   static const struct pci_device_id mlxsw_sp4_pci_id_table[] = {
> -	{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM4), 0},
> -	{0, },
> +	{PCI_VDEVICE(MELLANOX, PCI_DEVICE_ID_MELLANOX_SPECTRUM4) },
> +	{ },
>   };
>   
>   static struct pci_driver mlxsw_sp4_pci_driver = {
> diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
> index 26557cd32008..773fdd215a15 100644
> --- a/drivers/net/ethernet/micrel/ksz884x.c
> +++ b/drivers/net/ethernet/micrel/ksz884x.c
> @@ -6839,11 +6839,9 @@ static int __maybe_unused pcidev_suspend(struct device *dev_d)
>   static char pcidev_name[] = "ksz884xp";
>   
>   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,
> -		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
> -	{ 0 }
> +	{ PCI_VDEVICE(MICREL_KS, 0x8841) },
> +	{ PCI_VDEVICE(MICREL_KS, 0x8842) },
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, pcidev_table);
> diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c
> index 316f941629d4..70a2b0082ba8 100644
> --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c
> +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c
> @@ -17,12 +17,12 @@ static const char rnpgbe_driver_name[] = "rnpgbe";
>    *   private_data (used for different hw chip) }
>    */
>   static struct pci_device_id rnpgbe_pci_tbl[] = {
> -	{ PCI_VDEVICE(MUCSE, RNPGBE_DEVICE_ID_N210), board_n210 },
> -	{ PCI_VDEVICE(MUCSE, RNPGBE_DEVICE_ID_N210L), board_n210 },
> -	{ PCI_VDEVICE(MUCSE, RNPGBE_DEVICE_ID_N500_DUAL_PORT), board_n500 },
> -	{ PCI_VDEVICE(MUCSE, RNPGBE_DEVICE_ID_N500_QUAD_PORT), board_n500 },
> +	{ PCI_VDEVICE(MUCSE, RNPGBE_DEVICE_ID_N210), .driver_data = board_n210 },
> +	{ PCI_VDEVICE(MUCSE, RNPGBE_DEVICE_ID_N210L), .driver_data = board_n210 },
> +	{ PCI_VDEVICE(MUCSE, RNPGBE_DEVICE_ID_N500_DUAL_PORT), .driver_data = board_n500 },
> +	{ PCI_VDEVICE(MUCSE, RNPGBE_DEVICE_ID_N500_QUAD_PORT), .driver_data = board_n500 },
>   	/* required last entry */
> -	{0, },
> +	{ },
>   };
>   
>   /**
> diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
> index b253734dbc80..35a63b78880b 100644
> --- a/drivers/net/ethernet/natsemi/natsemi.c
> +++ b/drivers/net/ethernet/natsemi/natsemi.c
> @@ -248,8 +248,8 @@ static struct {
>   };
>   
>   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 },
> +	{ PCI_VDEVICE_SUB(NS, 0x0020, 0x12d9, 0x000c), .driver_data = 0 },
> +	{ PCI_VDEVICE(NS, 0x0020), .driver_data = 1 },
>   	{ }	/* terminate list */
>   };
>   MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl);
> diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
> index 48390b2fd44d..e8e4b84d505a 100644
> --- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
> +++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
> @@ -33,39 +33,56 @@
>   static const char nfp_driver_name[] = "nfp";
>   
>   static const struct pci_device_id nfp_pci_device_ids[] = {
> -	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP3800,
> -	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP3800,
> +	{
> +		PCI_VDEVICE_SUB(NETRONOME, PCI_DEVICE_ID_NFP3800,
> +				PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP3800,
> +	}, {
> +		PCI_VDEVICE_SUB(NETRONOME, PCI_DEVICE_ID_NFP4000,
> +				PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP6000,
> +	}, {
> +		PCI_VDEVICE_SUB(NETRONOME, PCI_DEVICE_ID_NFP5000,
> +				PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP6000,
> +	}, {
> +		PCI_VDEVICE_SUB(NETRONOME, PCI_DEVICE_ID_NFP6000,
> +				PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP6000,
> +	}, {
> +		PCI_VDEVICE_SUB(CORIGINE, PCI_DEVICE_ID_NFP3800,
> +				PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP3800,
> +	}, {
> +		PCI_VDEVICE_SUB(CORIGINE, PCI_DEVICE_ID_NFP4000,
> +				PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP6000,
> +	}, {
> +		PCI_VDEVICE_SUB(CORIGINE, PCI_DEVICE_ID_NFP5000,
> +				PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP6000,
> +	}, {
> +		PCI_VDEVICE_SUB(CORIGINE, PCI_DEVICE_ID_NFP6000,
> +				PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP6000,
>   	},
> -	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP4000,
> -	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP6000,
> -	},
> -	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP5000,
> -	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP6000,
> -	},
> -	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP6000,
> -	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP6000,
> -	},
> -	{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP3800,
> -	  PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP3800,
> -	},
> -	{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP4000,
> -	  PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP6000,
> -	},
> -	{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP5000,
> -	  PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP6000,
> -	},
> -	{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP6000,
> -	  PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP6000,
> -	},
> -	{ 0, } /* Required last entry. */
> +	{ } /* Required last entry. */
>   };
>   MODULE_DEVICE_TABLE(pci, nfp_pci_device_ids);
>   
> diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
> index b5646c884371..cf557e0ce011 100644
> --- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
> +++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
> @@ -38,23 +38,32 @@ struct nfp_net_vf {
>   static const char nfp_net_driver_name[] = "nfp_netvf";
>   
>   static const struct pci_device_id nfp_netvf_pci_device_ids[] = {
> -	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP3800_VF,
> -	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP3800_VF,
> +	{
> +		PCI_VDEVICE_SUB(NETRONOME, PCI_DEVICE_ID_NFP3800_VF,
> +				PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP3800_VF,
> +	}, {
> +		PCI_VDEVICE_SUB(NETRONOME, PCI_DEVICE_ID_NFP6000_VF,
> +				PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP6000_VF,
> +	}, {
> +		PCI_VDEVICE_SUB(CORIGINE, PCI_DEVICE_ID_NFP3800_VF,
> +				PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP3800_VF,
> +	}, {
> +		PCI_VDEVICE_SUB(CORIGINE, PCI_DEVICE_ID_NFP6000_VF,
> +				PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID),
> +		.class = PCI_ANY_ID,
> +		.class_mask = 0,
> +		.driver_data = NFP_DEV_NFP6000_VF,
>   	},
> -	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP6000_VF,
> -	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP6000_VF,
> -	},
> -	{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP3800_VF,
> -	  PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP3800_VF,
> -	},
> -	{ PCI_VENDOR_ID_CORIGINE, PCI_DEVICE_ID_NFP6000_VF,
> -	  PCI_VENDOR_ID_CORIGINE, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, NFP_DEV_NFP6000_VF,
> -	},
> -	{ 0, } /* Required last entry. */
> +	{ } /* Required last entry. */
>   };
>   MODULE_DEVICE_TABLE(pci, nfp_netvf_pci_device_ids);
>   
> diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
> index 39842eb73bc3..cb0ae0650905 100644
> --- a/drivers/net/ethernet/qlogic/qede/qede_main.c
> +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
> @@ -76,20 +76,20 @@ enum qede_pci_private {
>   };
>   
>   static const struct pci_device_id qede_pci_tbl[] = {
> -	{PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_40), QEDE_PRIVATE_PF},
> -	{PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_10), QEDE_PRIVATE_PF},
> -	{PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_MF), QEDE_PRIVATE_PF},
> -	{PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_100), QEDE_PRIVATE_PF},
> -	{PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_50), QEDE_PRIVATE_PF},
> -	{PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_25), QEDE_PRIVATE_PF},
> +	{ PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_40), .driver_data = QEDE_PRIVATE_PF },
> +	{ PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_10), .driver_data = QEDE_PRIVATE_PF },
> +	{ PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_MF), .driver_data = QEDE_PRIVATE_PF },
> +	{ PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_100), .driver_data = QEDE_PRIVATE_PF },
> +	{ PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_50), .driver_data = QEDE_PRIVATE_PF },
> +	{ PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_25), .driver_data = QEDE_PRIVATE_PF },
>   #ifdef CONFIG_QED_SRIOV
> -	{PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_IOV), QEDE_PRIVATE_VF},
> +	{ PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_57980S_IOV), .driver_data = QEDE_PRIVATE_VF },
>   #endif
> -	{PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_AH), QEDE_PRIVATE_PF},
> +	{ PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_AH), .driver_data = QEDE_PRIVATE_PF },
>   #ifdef CONFIG_QED_SRIOV
> -	{PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_AH_IOV), QEDE_PRIVATE_VF},
> +	{ PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_AH_IOV), .driver_data = QEDE_PRIVATE_VF },
>   #endif
> -	{ 0 }
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, qede_pci_tbl);
> diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
> index a8532ebd42ec..8241bcf76664 100644
> --- a/drivers/net/ethernet/realtek/8139too.c
> +++ b/drivers/net/ethernet/realtek/8139too.c
> @@ -235,44 +235,44 @@ static const struct {
>   
>   
>   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 },
> -	{0x1500, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x4033, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x1186, 0x1300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x1186, 0x1340, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x13d1, 0xab06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x1259, 0xa117, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x1259, 0xa11e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x14ea, 0xab06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x14ea, 0xab07, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x11db, 0x1234, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x1432, 0x9130, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x02ac, 0x1012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x018a, 0x0106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x126c, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x1743, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x021b, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> -	{0x16ec, 0xab06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> +	{ PCI_DEVICE(0x10ec, 0x8139), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x10ec, 0x8138), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x1113, 0x1211), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x1500, 0x1360), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x4033, 0x1360), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x1186, 0x1300), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x1186, 0x1340), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x13d1, 0xab06), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x1259, 0xa117), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x1259, 0xa11e), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x14ea, 0xab06), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x14ea, 0xab07), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x11db, 0x1234), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x1432, 0x9130), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x02ac, 0x1012), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x018a, 0x0106), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x126c, 0x1211), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x1743, 0x8139), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x021b, 0x8139), .driver_data = RTL8139 },
> +	{ PCI_DEVICE(0x16ec, 0xab06), .driver_data = RTL8139 },
>   
>   #ifdef CONFIG_SH_SECUREEDGE5410
>   	/* Bogus 8139 silicon reports 8129 without external PROM :-( */
> -	{0x10ec, 0x8129, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
> +	{ PCI_DEVICE(0x10ec, 0x8129), .driver_data = RTL8139 },
>   #endif
>   #ifdef CONFIG_8139TOO_8129
> -	{0x10ec, 0x8129, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8129 },
> +	{ PCI_DEVICE(0x10ec, 0x8129), .driver_data = RTL8129 },
>   #endif
>   
>   	/* some crazy cards report invalid vendor ids like
>   	 * 0x0001 here.  The other ids are valid and constant,
>   	 * so we simply don't match on the main vendor id.
>   	 */
> -	{PCI_ANY_ID, 0x8139, 0x10ec, 0x8139, 0, 0, RTL8139 },
> -	{PCI_ANY_ID, 0x8139, 0x1186, 0x1300, 0, 0, RTL8139 },
> -	{PCI_ANY_ID, 0x8139, 0x13d1, 0xab06, 0, 0, RTL8139 },
> +	{ PCI_DEVICE_SUB(PCI_ANY_ID, 0x8139, 0x10ec, 0x8139), .driver_data = RTL8139 },
> +	{ PCI_DEVICE_SUB(PCI_ANY_ID, 0x8139, 0x1186, 0x1300), .driver_data = RTL8139 },
> +	{ PCI_DEVICE_SUB(PCI_ANY_ID, 0x8139, 0x13d1, 0xab06), .driver_data = RTL8139 },
>   
> -	{0,}
> +	{ }
>   };
>   MODULE_DEVICE_TABLE (pci, rtl8139_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
> index 791277e750ba..ec4fc21fa21f 100644
> --- a/drivers/net/ethernet/realtek/r8169_main.c
> +++ b/drivers/net/ethernet/realtek/r8169_main.c
> @@ -229,7 +229,7 @@ static const struct pci_device_id rtl8169_pci_tbl[] = {
>   	{ PCI_VDEVICE(REALTEK,	0x2502) },
>   	{ PCI_VDEVICE(REALTEK,	0x2600) },
>   	{ PCI_VDEVICE(REALTEK,	0x8129) },
> -	{ PCI_VDEVICE(REALTEK,	0x8136), RTL_CFG_NO_GBIT },
> +	{ PCI_VDEVICE(REALTEK,	0x8136), .driver_data = RTL_CFG_NO_GBIT },
>   	{ PCI_VDEVICE(REALTEK,	0x8161) },
>   	{ PCI_VDEVICE(REALTEK,	0x8162) },
>   	{ PCI_VDEVICE(REALTEK,	0x8167) },
> @@ -240,15 +240,15 @@ static const struct pci_device_id rtl8169_pci_tbl[] = {
>   	{ PCI_VDEVICE(DLINK,	0x4302) },
>   	{ PCI_VDEVICE(AT,	0xc107) },
>   	{ PCI_VDEVICE(USR,	0x0116) },
> -	{ PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0024 },
> -	{ 0x0001, 0x8168, PCI_ANY_ID, 0x2410 },
> +	{ PCI_VDEVICE_SUB(LINKSYS, 0x1032, PCI_ANY_ID, 0x0024) },
> +	{ PCI_DEVICE_SUB(0x0001, 0x8168, PCI_ANY_ID, 0x2410) },
>   	{ PCI_VDEVICE(REALTEK,	0x8125) },
>   	{ PCI_VDEVICE(REALTEK,	0x8126) },
>   	{ PCI_VDEVICE(REALTEK,	0x8127) },
>   	{ PCI_VDEVICE(REALTEK,	0x3000) },
>   	{ PCI_VDEVICE(REALTEK,	0x5000) },
>   	{ PCI_VDEVICE(REALTEK,	0x0e10) },
> -	{}
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
> diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
> index ff6ca7b2cd4f..84a55f2b48ff 100644
> --- a/drivers/net/ethernet/rocker/rocker_main.c
> +++ b/drivers/net/ethernet/rocker/rocker_main.c
> @@ -40,8 +40,8 @@
>   static const char rocker_driver_name[] = "rocker";
>   
>   static const struct pci_device_id rocker_pci_id_table[] = {
> -	{PCI_VDEVICE(REDHAT, PCI_DEVICE_ID_REDHAT_ROCKER), 0},
> -	{0, }
> +	{ PCI_VDEVICE(REDHAT, PCI_DEVICE_ID_REDHAT_ROCKER) },
> +	{ }
>   };
>   
>   struct rocker_wait {
> diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
> index 12ddea514910..ed5276d492b9 100644
> --- a/drivers/net/ethernet/sis/sis190.c
> +++ b/drivers/net/ethernet/sis/sis190.c
> @@ -331,9 +331,9 @@ static const struct {
>   };
>   
>   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, },
> +	{ PCI_VDEVICE(SI, 0x0190), .driver_data = 0 },
> +	{ PCI_VDEVICE(SI, 0x0191), .driver_data = 1 },
> +	{ },
>   };
>   
>   MODULE_DEVICE_TABLE(pci, sis190_pci_tbl);
> diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
> index 1349ef50cd26..6e9afd9042f7 100644
> --- a/drivers/net/ethernet/sis/sis900.c
> +++ b/drivers/net/ethernet/sis/sis900.c
> @@ -104,11 +104,11 @@ static const char * card_names[] = {
>   };
>   
>   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,
> -	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_7016},
> -	{0,}
> +	{ PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_900),
> +	  .driver_data = SIS_900 },
> +	{ PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_7016),
> +	  .driver_data = SIS_7016 },
> +	{ }
>   };
>   MODULE_DEVICE_TABLE (pci, sis900_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c
> index 389659db06a8..60538b7fe684 100644
> --- a/drivers/net/ethernet/smsc/epic100.c
> +++ b/drivers/net/ethernet/smsc/epic100.c
> @@ -166,11 +166,19 @@ static const struct epic_chip_info pci_id_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,
> -	  PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, SMSC_83C175 },
> -	{ 0,}
> +	{
> +		PCI_DEVICE_SUB(0x10B8, 0x0005, 0x1092, 0x0AB4),
> +		.driver_data = SMSC_83C170_0,
> +	}, {
> +		PCI_DEVICE(0x10B8, 0x0005),
> +		.driver_data = SMSC_83C170,
> +	}, {
> +		PCI_DEVICE(0x10B8, 0x0006),
> +		.class = PCI_CLASS_NETWORK_ETHERNET << 8,
> +		.class_mask = 0xffff00,
> +		.driver_data = SMSC_83C175,
> +	},
> +	{ }
>   };
>   MODULE_DEVICE_TABLE (pci, epic_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
> index fe00e7dd3fe4..823870c999bf 100644
> --- a/drivers/net/ethernet/sun/cassini.c
> +++ b/drivers/net/ethernet/sun/cassini.c
> @@ -218,11 +218,9 @@ static u16 link_modes[] = {
>   };
>   
>   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,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
> -	{ 0, }
> +	{ PCI_VDEVICE(SUN, PCI_DEVICE_ID_SUN_CASSINI) },
> +	{ PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SATURN) },
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, cas_pci_tbl);
> diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
> index 8e69d917d827..234ffc3c6a61 100644
> --- a/drivers/net/ethernet/sun/sungem.c
> +++ b/drivers/net/ethernet/sun/sungem.c
> @@ -85,8 +85,7 @@ MODULE_LICENSE("GPL");
>   #define GEM_MODULE_NAME	"gem"
>   
>   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 },
> +	{ PCI_VDEVICE(SUN, PCI_DEVICE_ID_SUN_GEM) },
>   
>   	/* These models only differ from the original GEM in
>   	 * that their tx/rx fifos are of a different size and
> @@ -95,21 +94,14 @@ static const struct pci_device_id gem_pci_tbl[] = {
>   	 * Apple's GMAC does support gigabit on machines with
>   	 * the BCM54xx PHYs. -BenH
>   	 */
> -	{ PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_RIO_GEM,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
> -	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMAC,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
> -	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMACP,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
> -	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMAC2,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
> -	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_K2_GMAC,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
> -	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_SH_SUNGEM,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
> -	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID2_GMAC,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
> -	{0, }
> +	{ PCI_VDEVICE(SUN, PCI_DEVICE_ID_SUN_RIO_GEM) },
> +	{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMAC) },
> +	{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMACP) },
> +	{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMAC2) },
> +	{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_K2_GMAC) },
> +	{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_SH_SUNGEM) },
> +	{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_IPID2_GMAC) },
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, gem_pci_tbl);
> diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
> index a55b0f951181..274a1837025c 100644
> --- a/drivers/net/ethernet/ti/tlan.c
> +++ b/drivers/net/ethernet/ti/tlan.c
> @@ -119,33 +119,20 @@ static struct board {
>   };
>   
>   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,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
> -	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3I,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
> -	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_THUNDER,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
> -	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3B,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
> -	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100PI,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
> -	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100D,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
> -	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100I,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7 },
> -	{ PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2183,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
> -	{ PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2325,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 },
> -	{ PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2326,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
> -	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
> -	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_T2,
> -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
> -	{ 0,}
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10), .driver_data = 0 },
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100), .driver_data = 1 },
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3I), .driver_data = 2 },
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_THUNDER), .driver_data = 3 },
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3B), .driver_data = 4 },
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100PI), .driver_data = 5 },
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100D), .driver_data = 6 },
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100I), .driver_data = 7 },
> +	{ PCI_VDEVICE(OLICOM, PCI_DEVICE_ID_OLICOM_OC2183), .driver_data = 8 },
> +	{ PCI_VDEVICE(OLICOM, PCI_DEVICE_ID_OLICOM_OC2325), .driver_data = 9 },
> +	{ PCI_VDEVICE(OLICOM, PCI_DEVICE_ID_OLICOM_OC2326), .driver_data = 10 },
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100), .driver_data = 11 },
> +	{ PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_T2), .driver_data = 12 },
> +	{ }
>   };
>   MODULE_DEVICE_TABLE(pci, tlan_pci_tbl);
>   
> diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> index d8e3827a8b1f..d51d8db95a76 100644
> --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> @@ -30,20 +30,20 @@ char ngbe_driver_name[] = "ngbe";
>    *   Class, Class Mask, private data (not used) }
>    */
>   static const struct pci_device_id ngbe_pci_tbl[] = {
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL_W), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A2), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A2S), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A4), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A4S), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL2), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL2S), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL4), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL4S), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860LC), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A1), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A1L), 0},
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL_W) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A2) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A2S) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A4) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A4S) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL2) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL2S) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL4) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860AL4S) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860LC) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A1) },
> +	{ PCI_VDEVICE(WANGXUN, NGBE_DEV_ID_EM_WX1860A1L) },
>   	/* required last entry */
> -	{ .device = 0 }
> +	{ }
>   };
>   
>   /**
> diff --git a/drivers/net/ethernet/wangxun/ngbevf/ngbevf_main.c b/drivers/net/ethernet/wangxun/ngbevf/ngbevf_main.c
> index 6ef43adcc425..d79cf8d8484f 100644
> --- a/drivers/net/ethernet/wangxun/ngbevf/ngbevf_main.c
> +++ b/drivers/net/ethernet/wangxun/ngbevf/ngbevf_main.c
> @@ -26,20 +26,20 @@
>    *   Class, Class Mask, private data (not used) }
>    */
>   static const struct pci_device_id ngbevf_pci_tbl[] = {
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL_W), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A2), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A2S), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A4), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A4S), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL2), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL2S), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL4), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL4S), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860NCSI), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A1), 0},
> -	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL1), 0},
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL_W) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A2) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A2S) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A4) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A4S) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL2) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL2S) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL4) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL4S) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860NCSI) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860A1) },
> +	{ PCI_VDEVICE(WANGXUN, NGBEVF_DEV_ID_EM_WX1860AL1) },
>   	/* required last entry */
> -	{ .device = 0 }
> +	{ }
>   };
>   
>   static const struct net_device_ops ngbevf_netdev_ops = {
> diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
> index 8b7c3753bb6a..4c549c2644ab 100644
> --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
> +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
> @@ -37,16 +37,16 @@ char txgbe_driver_name[] = "txgbe";
>    *   Class, Class Mask, private data (not used) }
>    */
>   static const struct pci_device_id txgbe_pci_tbl[] = {
> -	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_SP1000), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_WX1820), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5010), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5110), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5025), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5125), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5040), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5140), 0},
> +	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_SP1000) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_WX1820) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5010) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5110) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5025) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5125) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5040) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBE_DEV_ID_AML5140) },
>   	/* required last entry */
> -	{ .device = 0 }
> +	{ }
>   };
>   
>   #define DEFAULT_DEBUG_LEVEL_SHIFT 3
> diff --git a/drivers/net/ethernet/wangxun/txgbevf/txgbevf_main.c b/drivers/net/ethernet/wangxun/txgbevf/txgbevf_main.c
> index 37e4ec487afd..8b16b900820a 100644
> --- a/drivers/net/ethernet/wangxun/txgbevf/txgbevf_main.c
> +++ b/drivers/net/ethernet/wangxun/txgbevf/txgbevf_main.c
> @@ -26,16 +26,16 @@
>    *   Class, Class Mask, private data (not used) }
>    */
>   static const struct pci_device_id txgbevf_pci_tbl[] = {
> -	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_SP1000), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_WX1820), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML500F), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML510F), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML5024), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML5124), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML503F), 0},
> -	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML513F), 0},
> +	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_SP1000) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_WX1820) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML500F) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML510F) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML5024) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML5124) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML503F) },
> +	{ PCI_VDEVICE(WANGXUN, TXGBEVF_DEV_ID_AML513F) },
>   	/* required last entry */
> -	{ .device = 0 }
> +	{ }
>   };
>   
>   static const struct net_device_ops txgbevf_netdev_ops = {
> diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
> index 73f393900710..6508c53bdc24 100644
> --- a/drivers/net/wan/farsync.c
> +++ b/drivers/net/wan/farsync.c
> @@ -524,27 +524,21 @@ do {								\
>   /*      PCI ID lookup table
>    */
>   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},
> +	{ PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2P), .driver_data = FST_TYPE_T2P },
>   
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4P, PCI_ANY_ID,
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_T4P},
> +	{ PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4P), .driver_data = FST_TYPE_T4P },
>   
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T1U, PCI_ANY_ID,
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_T1U},
> +	{ PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T1U), .driver_data = FST_TYPE_T1U },
>   
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2U, PCI_ANY_ID,
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_T2U},
> +	{ PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2U), .driver_data = FST_TYPE_T2U },
>   
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4U, PCI_ANY_ID,
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_T4U},
> +	{ PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4U), .driver_data = FST_TYPE_T4U },
>   
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1, PCI_ANY_ID,
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
> +	{ PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1), .driver_data = FST_TYPE_TE1 },
>   
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1C, PCI_ANY_ID,
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
> -	{0,}			/* End */
> +	{ PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1C), .driver_data = FST_TYPE_TE1 },
> +
> +	{ }			/* End */
>   };
>   
>   MODULE_DEVICE_TABLE(pci, fst_pci_dev_id);
> diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
> index 7e57d289b62c..a91564e53caa 100644
> --- a/drivers/net/wan/pc300too.c
> +++ b/drivers/net/wan/pc300too.c
> @@ -461,15 +461,11 @@ static int pc300_pci_init_one(struct pci_dev *pdev,
>   }
>   
>   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,
> -	  PCI_ANY_ID, 0, 0, 0 },
> -	{ PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_TE_1, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, 0, 0 },
> -	{ PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_TE_2, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, 0, 0 },
> -	{ 0, }
> +	{ PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_RX_1) },
> +	{ PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_RX_2) },
> +	{ PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_TE_1) },
> +	{ PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_TE_2) },
> +	{ }
>   };
>   
>   static struct pci_driver pc300_pci_driver = {
> diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
> index 89f4b4584a33..9503130fd9a8 100644
> --- a/drivers/net/wan/pci200syn.c
> +++ b/drivers/net/wan/pci200syn.c
> @@ -397,9 +397,9 @@ static int pci200_pci_init_one(struct pci_dev *pdev,
>   }
>   
>   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, }
> +	{ PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9050,
> +			  PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_PCI200SYN) },
> +	{ }
>   };
>   
>   static struct pci_driver pci200_pci_driver = {
> diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
> index 3f7707118450..d4da88c77112 100644
> --- a/drivers/net/wan/wanxl.c
> +++ b/drivers/net/wan/wanxl.c
> @@ -806,13 +806,10 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,
>   }
>   
>   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,
> -	  PCI_ANY_ID, 0, 0, 0 },
> -	{ PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL400, PCI_ANY_ID,
> -	  PCI_ANY_ID, 0, 0, 0 },
> -	{ 0, }
> +	{ PCI_VDEVICE(SBE, PCI_DEVICE_ID_SBE_WANXL100) },
> +	{ PCI_VDEVICE(SBE, PCI_DEVICE_ID_SBE_WANXL200) },
> +	{ PCI_VDEVICE(SBE, PCI_DEVICE_ID_SBE_WANXL400) },
> +	{ }
>   };
>   
>   static struct pci_driver wanxl_pci_driver = {
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> index 45b342ea0637..13662aa4b4ea 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> @@ -2708,17 +2708,18 @@ static const struct dev_pm_ops brcmf_pciedrvr_pm = {
>   
>   #define BRCMF_PCIE_DEVICE(dev_id, fw_vend) \
>   	{ \
> -		BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id), \
> -		PCI_ANY_ID, PCI_ANY_ID, \
> -		PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, \
> -		BRCMF_DRVDATA_ ## fw_vend \
> +		PCI_DEVICE(BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id)), \
> +		.class = PCI_CLASS_NETWORK_OTHER << 8, \
> +		.class_mask = 0xffff00, \
> +		.driver_data = BRCMF_DRVDATA_ ## fw_vend, \
>   	}
>   #define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev, fw_vend) \
>   	{ \
> -		BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id), \
> -		(subvend), (subdev), \
> -		PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, \
> -		BRCMF_DRVDATA_ ## fw_vend \
> +		PCI_DEVICE_SUB(BRCM_PCIE_VENDOR_ID_BROADCOM, (dev_id), \
> +			       (subvend), (subdev)), \
> +		.class = PCI_CLASS_NETWORK_OTHER << 8, \
> +		.class_mask = 0xffff00, \
> +		.driver_data = BRCMF_DRVDATA_ ## fw_vend, \
>   	}
>   
>   static const struct pci_device_id brcmf_pcie_devid_table[] = {
> diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
> index dd64d21174e3..4bc9bb406e8e 100644
> --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
> +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
> @@ -11366,37 +11366,41 @@ static int ipw_wdev_init(struct net_device *dev)
>   
>   /* PCI driver stuff */
>   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},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2712, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2721, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2722, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2731, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2732, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2741, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x103c, 0x2741, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2742, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2751, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2752, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2753, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2754, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2761, 0, 0, 0},
> -	{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2762, 0, 0, 0},
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2701) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2702) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2711) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2712) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2721) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2722) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2731) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2732) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2741) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x103c, 0x2741) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2742) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2751) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2752) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2753) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2754) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2761) },
> +	{ PCI_VDEVICE_SUB(INTEL, 0x1043, 0x8086, 0x2762) },
> +
>   	/*
>   	 * This ID conflicts with i40e, but the devices can be differentiated
>   	 * because i40e devices use PCI_CLASS_NETWORK_ETHERNET and ipw2200
>   	 * devices use PCI_CLASS_NETWORK_OTHER.
>   	 */
> -	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x104f),
> -		PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0},
> -	{PCI_VDEVICE(INTEL, 0x4220), 0},	/* BG */
> -	{PCI_VDEVICE(INTEL, 0x4221), 0},	/* BG */
> -	{PCI_VDEVICE(INTEL, 0x4223), 0},	/* ABG */
> -	{PCI_VDEVICE(INTEL, 0x4224), 0},	/* ABG */
> +	{
> +		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x104f),
> +		.class = PCI_CLASS_NETWORK_OTHER << 8,
> +		.class_mask = 0xffff00,
> +	},
> +	{ PCI_VDEVICE(INTEL, 0x4220) },	/* BG */
> +	{ PCI_VDEVICE(INTEL, 0x4221) },	/* BG */
> +	{ PCI_VDEVICE(INTEL, 0x4223) },	/* ABG */
> +	{ PCI_VDEVICE(INTEL, 0x4224) },	/* ABG */
>   
>   	/* required last entry */
> -	{0,}
> +	{ }
>   };
>   
>   MODULE_DEVICE_TABLE(pci, card_ids);
>
> base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731