Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b473528 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

nfp: Use PCI_DEVICE_ID_NETRONOME_NFP* defines 



Use PCI_DEVICE_ID_NETRONOME_NFP*, defined in linux/pci_ids.h,
rather than replicating the same values in the NFP driver.

Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
Acked-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 806a8376

drivers/net/ethernet/netronome/nfp/nfp_main.c

+2 −2
Original line number Diff line number Diff line
@@ -58,11 +58,11 @@ static const char nfp_driver_name[] = "nfp"; 
const char nfp_driver_version[] = VERMAGIC_STRING;



static const struct pci_device_id nfp_pci_device_ids[] = {

	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_NFP6000,

	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000,

	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,

	  PCI_ANY_ID, 0,

	},

	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_NFP4000,

	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP4000,

	  PCI_VENDOR_ID_NETRONOME, PCI_ANY_ID,

	  PCI_ANY_ID, 0,

	},

drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c

+2 −2
Original line number Diff line number Diff line
@@ -640,8 +640,8 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface) 
		nfp->expl.data = bar->iomem + NFP_PCIE_SRAM + 0x1000;

	}



	if (nfp->pdev->device == PCI_DEVICE_NFP4000 ||

	    nfp->pdev->device == PCI_DEVICE_NFP6000) {

	if (nfp->pdev->device == PCI_DEVICE_ID_NETRONOME_NFP4000 ||

	    nfp->pdev->device == PCI_DEVICE_ID_NETRONOME_NFP6000) {

		nfp->iomem.csr = bar->iomem + NFP_PCIE_BAR(0);

		expl_groups = 4;

	} else {

drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h

+0 −5
Original line number Diff line number Diff line
@@ -58,11 +58,6 @@ 


#define PCI_64BIT_BAR_COUNT             3



/* NFP hardware vendor/device ids.

 */

#define PCI_DEVICE_NFP4000              0x4000

#define PCI_DEVICE_NFP6000              0x6000



#define NFP_CPP_NUM_TARGETS             16



struct device;