From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 1FABD8D3C for ; Sun, 10 Jan 2016 13:51:10 +0100 (CET) Received: by mail-wm0-f54.google.com with SMTP id u188so185043289wmu.1 for ; Sun, 10 Jan 2016 04:51:10 -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=P7c1h4IpkiPsEOP26KlhevV1hLih9ZVNKVHT+eqSTZY=; b=Wa3z/lV04bGs8BAKC1K4A4hXZkmj5Z6eYG1jYlO5cyLez6Y387qnWTeGp5Y5gu7NJ+ NosyG6Q1X7SXQx7rjPPk1ufaGoGt67ko5fIp/TGDd7v118NtwLsjXDfaYLPUHWV+lfTB eX0XGHrUZO7WWeEobXXQvvq/cyiPhUNpKqmqk7BGXJ1WlAmKg3nb3A6saNJdvSpaeU6M v45+3l9rk3rFLSu16H+oltiPw5AyZurl8hvj566LIPZpt7GO+x+VULT/K4cbk+/kX3z2 k8TJcpDCpUP4NN60hm4pnaZuwabC1fFsdmwEy84QyxDQYH+0tU5GdRTkcn7DECit+xDo TRAA== 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=P7c1h4IpkiPsEOP26KlhevV1hLih9ZVNKVHT+eqSTZY=; b=Ah1iGAhsaLWRzKpX5G/2EJuS7fu+ThKB39OKxKAvw4jOIxDI9w58NfPSwme/ficW8y 1F6FnDEml1nI4l9RpjBoIefenCyIBtgfwxDv6fCwE3QRX9LYhubBKw7pJ6fKwCFWjyfo WnlfCIoGG5TK+9sHSFe4jPesgwsIfbySk0GrJRfsQnoUZ5b6I21s0SCE21/WH/6wv4df Gy8XJLrim0Ws8JaZbjzSDGVl+F9ga3atV4qmqsnqFXjMKSH6rmNNI+xW5WCdEp9VrdLA boKKXUbQsJFzfk9GA42lBpt8Ks/qTpXS/T85udq0k0lF9RS28eiynoVWsmSX8UBUav/r EYCA== X-Gm-Message-State: ALoCoQm+aUY8q8mKVGpu6GzPYZG9h7jNfHRqPBnhPfPXLIlrj6yOm5GyOj0l/Zk5bnsrAcZdKstzOf4vbtuwcduaWEEeOgMi0A== X-Received: by 10.28.6.213 with SMTP id 204mr8144118wmg.47.1452430269932; Sun, 10 Jan 2016 04:51:09 -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 u12sm8088011wmu.10.2016.01.10.04.51.08 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jan 2016 04:51:09 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Sun, 10 Jan 2016 13:50:47 +0100 Message-Id: <1452430254-30390-5-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> References: <1452430254-30390-1-git-send-email-david.marchand@6wind.com> Cc: thomas.monjalon@dpdk.org Subject: [dpdk-dev] [PATCH 04/11] 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: Sun, 10 Jan 2016 12:51:10 -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 --- drivers/net/fm10k/fm10k_ethdev.c | 8 +++---- lib/librte_eal/common/include/rte_pci_dev_ids.h | 29 ------------------------- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index e4aed94..3ab744a 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -2741,10 +2741,10 @@ 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" - { .vendor_id = 0, /* sentinel */ }, +{ 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 */ }, }; static struct eth_driver rte_pmd_fm10k = { 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