From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by dpdk.org (Postfix) with ESMTP id 0006C8E6E for ; Mon, 18 Jan 2016 13:30:58 +0100 (CET) Received: by mail-wm0-f49.google.com with SMTP id r129so49346025wmr.0 for ; Mon, 18 Jan 2016 04:30:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XH7xXcTLNTg0VIdBTjdMr4/SHGflNd/ddqomby3Q8WI=; b=wRQLW1pHkli1f1VjLDLV4XpMdR2P5Xm3o6KYU6Oy9BFdEYasutuIhu8kOWGbUFGbxW 9BXOnWEgIgy8IS7fTyg46FHdPE+uYHopk36OwcHDtYiRHt872TvDVTjRnHTDrreZFBb4 bIDPcZSaMaIUcEF1DPHwjyFGr3HMgEda6iPXNcx9lILPH4Q+Wsnb3+EFc0NUXProwXsG b1B7mQGd9O1JrZNILf0aJBfroWYZlpPftYY93+gsCH7qDFfbWOuFSN+GI4nv38Da5Gy/ HQd4qWm93cOkKLE0X5pq0Y4Qw2vWkcYFRtheVObSOFkzgaFqKyZUNmrJ4jWAc8Xo43yW s5AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XH7xXcTLNTg0VIdBTjdMr4/SHGflNd/ddqomby3Q8WI=; b=l/Yv/FI2EDeVw4JiXh6Ry97W/AVeviJWMuWKFacOPcZPWkDWfrwOR+KYr+b7yZc2KI 5QCGGoTfrZ8IEY1snEBG/vYTRQB7vu7w3Q6yiCgNMEAfunz6jxZKV9QqyvS/b3HcSLcr IJNWSM2nWiwx/B4klAsMPnqpMtjwf7olPeN9BjahkaXEvS/x76ZtyA+VU+X+Fuz1ezMf RKe/ss+vBSbwTAu17/77m4EfsAV7CTVSlokJnvpB3Oj9sI67pHCsIBTJ/4CQRoR12Biz naGFQsejJT1tAiZMiMqxJvMCF4U67wZwI9i5w4fslgnaQ3mJQtljqsLpR+HfCp1AxQdW IW3g== X-Gm-Message-State: AG10YOS/KoWPE/8Gdn4Bx8lB8baL4TFlv8uUSD4HV9M1yeyb+a3E3ZFfyjmlVBkSRC1LdpIY X-Received: by 10.28.174.77 with SMTP id x74mr12066772wme.99.1453120258879; Mon, 18 Jan 2016 04:30:58 -0800 (PST) Received: from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net. [78.126.77.144]) by smtp.gmail.com with ESMTPSA id u191sm15606572wmd.4.2016.01.18.04.30.57 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Jan 2016 04:30:57 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Mon, 18 Jan 2016 13:30:42 +0100 Message-Id: <1453120248-28274-5-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453120248-28274-1-git-send-email-david.marchand@6wind.com> References: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> <1453120248-28274-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH v2 04/10] fm10k: move pci device ids to driver X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2016 12:30:59 -0000 Since the base driver already defines all pci device ids, no need to redefine them, let's just drop the previous RTE_PCI_DEV_ID_DECL* stuff. Signed-off-by: David Marchand --- Changes since v1: - indent fix drivers/net/fm10k/fm10k_ethdev.c | 6 ++--- lib/librte_eal/common/include/rte_pci_dev_ids.h | 29 ------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index e4aed94..2c4905c 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -2741,9 +2741,9 @@ eth_fm10k_dev_uninit(struct rte_eth_dev *dev) * and SRIOV-VF devices. */ static const struct rte_pci_id pci_id_fm10k_map[] = { -#define RTE_PCI_DEV_ID_DECL_FM10K(vend, dev) { RTE_PCI_DEVICE(vend, dev) }, -#define RTE_PCI_DEV_ID_DECL_FM10KVF(vend, dev) { RTE_PCI_DEVICE(vend, dev) }, -#include "rte_pci_dev_ids.h" + { RTE_PCI_DEVICE(FM10K_INTEL_VENDOR_ID, FM10K_DEV_ID_PF) }, + { RTE_PCI_DEVICE(FM10K_INTEL_VENDOR_ID, FM10K_DEV_ID_SDI_FM10420_QDA2) }, + { RTE_PCI_DEVICE(FM10K_INTEL_VENDOR_ID, FM10K_DEV_ID_VF) }, { .vendor_id = 0, /* sentinel */ }, }; diff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h index f1f3e13..a19fdfa 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_ids.h +++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h @@ -97,14 +97,6 @@ #define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) #endif -#ifndef RTE_PCI_DEV_ID_DECL_FM10K -#define RTE_PCI_DEV_ID_DECL_FM10K(vend, dev) -#endif - -#ifndef RTE_PCI_DEV_ID_DECL_FM10KVF -#define RTE_PCI_DEV_ID_DECL_FM10KVF(vend, dev) -#endif - #ifndef RTE_PCI_DEV_ID_DECL_ENIC #define RTE_PCI_DEV_ID_DECL_ENIC(vend, dev) #endif @@ -117,11 +109,6 @@ #define RTE_PCI_DEV_ID_DECL_BNX2XVF(vend, dev) #endif -#ifndef PCI_VENDOR_ID_INTEL -/** Vendor ID used by Intel devices */ -#define PCI_VENDOR_ID_INTEL 0x8086 -#endif - #ifndef PCI_VENDOR_ID_QUMRANET /** Vendor ID used by virtio devices */ #define PCI_VENDOR_ID_QUMRANET 0x1AF4 @@ -142,14 +129,6 @@ #define PCI_VENDOR_ID_BROADCOM 0x14E4 #endif -/*************** Physical FM10K devices from fm10k_type.h ***************/ - -#define FM10K_DEV_ID_PF 0x15A4 -#define FM10K_DEV_ID_SDI_FM10420_QDA2 0x15D0 - -RTE_PCI_DEV_ID_DECL_FM10K(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_PF) -RTE_PCI_DEV_ID_DECL_FM10K(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_SDI_FM10420_QDA2) - /****************** Virtio devices from virtio.h ******************/ #define QUMRANET_DEV_ID_VIRTIO 0x1000 @@ -162,12 +141,6 @@ RTE_PCI_DEV_ID_DECL_VIRTIO(PCI_VENDOR_ID_QUMRANET, QUMRANET_DEV_ID_VIRTIO) RTE_PCI_DEV_ID_DECL_VMXNET3(PCI_VENDOR_ID_VMWARE, VMWARE_DEV_ID_VMXNET3) -/*************** Virtual FM10K devices from fm10k_type.h ***************/ - -#define FM10K_DEV_ID_VF 0x15A5 - -RTE_PCI_DEV_ID_DECL_FM10KVF(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_VF) - /****************** Cisco VIC devices ******************/ #define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043 /* ethernet vnic */ @@ -228,5 +201,3 @@ RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_MF) #undef RTE_PCI_DEV_ID_DECL_BNX2XVF #undef RTE_PCI_DEV_ID_DECL_VIRTIO #undef RTE_PCI_DEV_ID_DECL_VMXNET3 -#undef RTE_PCI_DEV_ID_DECL_FM10K -#undef RTE_PCI_DEV_ID_DECL_FM10KVF -- 1.9.1