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 and irritating assignment for .class to match what (I think) all other drivers are doing that don't need to match on .class, i.e. set both members to zero. Signed-off-by: Uwe Kleine-König (The Capable Hub) --- Hello, the equivalent of this patch got a Reviewed-by tag from Aleksandr Loktionov. As the patch changed how it looks considerably due to reordering the patches I didn't add it here. Best regards Uwe drivers/net/ethernet/netronome/nfp/nfp_main.c | 16 ++++++++-------- .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c index 48390b2fd44d..2dd8ff330fd7 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c @@ -35,35 +35,35 @@ 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, + 0, 0, NFP_DEV_NFP3800, }, { PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NFP4000, PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID, - PCI_ANY_ID, 0, NFP_DEV_NFP6000, + 0, 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, + 0, 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, + 0, 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, + 0, 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, + 0, 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, + 0, 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, 0, NFP_DEV_NFP6000, }, { 0, } /* 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 b5646c884371..2414bcd319b1 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c @@ -40,19 +40,19 @@ 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, + 0, 0, NFP_DEV_NFP3800_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, + 0, 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, + 0, 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, 0, NFP_DEV_NFP6000_VF, }, { 0, } /* Required last entry. */ }; -- 2.47.3