All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Horman <simon.horman@corigine.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, oss-drivers@corigine.com
Subject: [PATCH net-next 05/11] nfp: sort the device ID tables
Date: Fri, 11 Mar 2022 11:43:00 +0100	[thread overview]
Message-ID: <20220311104306.28357-6-simon.horman@corigine.com> (raw)
In-Reply-To: <20220311104306.28357-1-simon.horman@corigine.com>

From: Jakub Kicinski <jakub.kicinski@netronome.com>

Make sure the device ID tables are in ascending order.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Fei Qin <fei.qin@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
---
 drivers/net/ethernet/netronome/nfp/nfp_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index bb3b8a7f6c5d..8f2458cd7e0a 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -32,7 +32,7 @@
 static const char nfp_driver_name[] = "nfp";
 
 static const struct pci_device_id nfp_pci_device_ids[] = {
-	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000,
+	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP4000,
 	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
 	  PCI_ANY_ID, 0,
 	},
@@ -40,7 +40,7 @@ static const struct pci_device_id nfp_pci_device_ids[] = {
 	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
 	  PCI_ANY_ID, 0,
 	},
-	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP4000,
+	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000,
 	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,
 	  PCI_ANY_ID, 0,
 	},
-- 
2.30.2


  parent reply	other threads:[~2022-03-11 10:43 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-11 10:42 [PATCH net-next 0/11] nfp: preliminary support for NFP-3800 Simon Horman
2022-03-11 10:42 ` [PATCH net-next 01/11] nfp: remove defines for unused control bits Simon Horman
2022-03-11 10:42 ` [PATCH net-next 02/11] nfp: remove pessimistic NFP_QCP_MAX_ADD limits Simon Horman
2022-03-11 10:42 ` [PATCH net-next 03/11] nfp: use PCI_DEVICE_ID_NETRONOME_NFP6000_VF for VFs instead Simon Horman
2022-03-11 10:42 ` [PATCH net-next 04/11] nfp: use PluDevice register for model for non-NFP6000 chips Simon Horman
2022-03-11 10:43 ` Simon Horman [this message]
2022-03-11 10:43 ` [PATCH net-next 06/11] nfp: introduce dev_info static chip data Simon Horman
2022-03-11 10:43 ` [PATCH net-next 07/11] nfp: use dev_info for PCIe config space BAR offsets Simon Horman
2022-03-11 10:43 ` [PATCH net-next 08/11] nfp: use dev_info for the DMA mask Simon Horman
2022-03-11 10:43 ` [PATCH net-next 09/11] nfp: parametrize QCP offset/size using dev_info Simon Horman
2022-03-11 10:43 ` [PATCH net-next 10/11] nfp: take chip version into account for ring sizes Simon Horman
2022-03-11 10:43 ` [PATCH net-next 11/11] nfp: add support for NFP3800/NFP3803 PCIe devices Simon Horman
2022-03-12  7:40 ` [PATCH net-next 0/11] nfp: preliminary support for NFP-3800 patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220311104306.28357-6-simon.horman@corigine.com \
    --to=simon.horman@corigine.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oss-drivers@corigine.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.