With .class_mask being zero the value of .class doesn't matter because to check if a pci_device_id entry matches a given device the expression (id->class ^ dev->class) & id->class_mask is checked for being zero (see pci_match_one_device()). So drop the useless assignment for .class and .class_mask to match what (I think) all other drivers are doing. This also resolves an ambiguity because PCI_VDEVICE_SUB() already contains values for .class and .class_mask (which gcc ignores in the presence of the named initializer). Signed-off-by: Uwe Kleine-König (The Capable Hub) --- drivers/net/ethernet/netronome/nfp/nfp_main.c | 16 ---------------- .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 8 -------- 2 files changed, 24 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c index e8e4b84d505a..5a9fb5bad405 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c @@ -36,50 +36,34 @@ static const struct pci_device_id nfp_pci_device_ids[] = { { 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, }, { } /* Required last entry. */ diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c index cf557e0ce011..6c8f3321048a 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c @@ -41,26 +41,18 @@ static const struct pci_device_id nfp_netvf_pci_device_ids[] = { { 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, }, { } /* Required last entry. */ -- 2.47.3