From patchwork Fri Oct 30 15:08:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 8436 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 3A6039587; Fri, 30 Oct 2015 16:09:36 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 83AD393B4 for ; Fri, 30 Oct 2015 16:09:22 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 30 Oct 2015 08:09:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,219,1444719600"; d="scan'208";a="839368756" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga002.fm.intel.com with ESMTP; 30 Oct 2015 08:09:20 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t9UF9KZZ009341; Fri, 30 Oct 2015 15:09:20 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t9UF9Kbu010318; Fri, 30 Oct 2015 15:09:20 GMT Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id t9UF9KkX010314; Fri, 30 Oct 2015 15:09:20 GMT From: Bernard Iremonger To: dev@dpdk.org Date: Fri, 30 Oct 2015 15:08:47 +0000 Message-Id: <1446217733-9887-23-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1446217733-9887-1-git-send-email-bernard.iremonger@intel.com> References: <1446217733-9887-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v7 22/28] null: remove pci device 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" remove rte_null_pmd and pci_dev. Signed-off-by: Bernard Iremonger Acked-by: Bruce Richardson --- drivers/net/null/rte_eth_null.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index d34b60e..f12f31e 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -379,7 +379,6 @@ eth_dev_null_create(const char *name, const unsigned nb_rx_queues = 1; const unsigned nb_tx_queues = 1; struct rte_eth_dev_data *data = NULL; - struct rte_pci_device *pci_dev = NULL; struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; @@ -396,10 +395,6 @@ eth_dev_null_create(const char *name, if (data == NULL) goto error; - pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, numa_node); - if (pci_dev == NULL) - goto error; - internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node); if (internals == NULL) goto error; @@ -411,8 +406,8 @@ eth_dev_null_create(const char *name, /* now put it all together * - store queue data in internals, - * - store numa_node info in pci_driver - * - point eth_dev_data to internals and pci_driver + * - store numa_node info in ethdev data + * - point eth_dev_data to internals * - and point eth_dev structure to new eth_dev_data structure */ /* NOTE: we'll replace the data element, of originally allocated eth_dev @@ -424,8 +419,6 @@ eth_dev_null_create(const char *name, internals->packet_copy = packet_copy; internals->numa_node = numa_node; - pci_dev->numa_node = numa_node; - data->dev_private = internals; data->port_id = eth_dev->data->port_id; data->nb_rx_queues = (uint16_t)nb_rx_queues; @@ -455,7 +448,6 @@ eth_dev_null_create(const char *name, error: rte_free(data); - rte_free(pci_dev); rte_free(internals); return -1; @@ -558,14 +550,13 @@ rte_pmd_null_devuninit(const char *name) RTE_LOG(INFO, PMD, "Closing null ethdev on numa socket %u\n", rte_socket_id()); - /* reserve an ethdev entry */ + /* find the ethdev entry */ eth_dev = rte_eth_dev_allocated(name); if (eth_dev == NULL) return -1; rte_free(eth_dev->data->dev_private); rte_free(eth_dev->data); - rte_free(eth_dev->pci_dev); rte_eth_dev_release_port(eth_dev);