]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: nfp: Drop PCI class entries with .class_mask = 0
authorUwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Mon, 11 May 2026 09:00:23 +0000 (11:00 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 13 May 2026 01:16:34 +0000 (18:16 -0700)
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) <u.kleine-koenig@baylibre.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Link: https://patch.msgid.link/20260511090023.1634387-5-u.kleine-koenig@baylibre.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/netronome/nfp/nfp_main.c
drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c

index 48390b2fd44db8e07cd5804e7bed2b03b36f7379..2dd8ff330fd7d444ba0f9e815ccfe5c7d79cf4bf 100644 (file)
@@ -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. */
 };
index b5646c88437102aeeb8dba1c54cc7793dcb7aa65..2414bcd319b1027afb943724826b3f557cdfe137 100644 (file)
@@ -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. */
 };