From patchwork Fri Oct 23 17:36:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 7978 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 5593791C8; Fri, 23 Oct 2015 19:58:24 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 4562B8E9B for ; Fri, 23 Oct 2015 19:58:23 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 23 Oct 2015 10:56:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,187,1444719600"; d="scan'208";a="586795783" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by FMSMGA003.fm.intel.com with ESMTP; 23 Oct 2015 10:56:23 -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 t9NHb4Mj006670; Fri, 23 Oct 2015 18:37:04 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t9NHb4IZ003869; Fri, 23 Oct 2015 18:37:04 +0100 Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id t9NHb3br003864; Fri, 23 Oct 2015 18:37:03 +0100 From: Bernard Iremonger To: dev@dpdk.org Date: Fri, 23 Oct 2015 18:36:29 +0100 Message-Id: <1445621793-3630-25-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1445621793-3630-1-git-send-email-bernard.iremonger@intel.com> References: <1445621793-3630-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v5 24/28] pcap: 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_pcap_pmd and pci_dev. Signed-off-by: Bernard Iremonger --- drivers/net/pcap/rte_eth_pcap.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index d352a14..5f416f4 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -617,13 +617,6 @@ static const struct eth_dev_ops ops = { .stats_reset = eth_stats_reset, }; -static struct eth_driver rte_pcap_pmd = { - .pci_drv = { - .name = "rte_pcap_pmd", - .drv_flags = RTE_PCI_DRV_DETACHABLE, - }, -}; - /* * Function handler that opens the pcap file for reading a stores a * reference of it for use it later on. @@ -806,7 +799,6 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, struct rte_kvargs *kvlist) { struct rte_eth_dev_data *data = NULL; - struct rte_pci_device *pci_dev = NULL; unsigned k_idx; struct rte_kvargs_pair *pair = NULL; @@ -819,17 +811,13 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, RTE_LOG(INFO, PMD, "Creating pcap-backed ethdev on numa socket %u\n", numa_node); - /* now do all data allocation - for eth_dev structure, dummy pci driver + /* now do all data allocation - for eth_dev structure * and internal (private) data */ data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node); 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; @@ -860,8 +848,6 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, else (*internals)->if_index = if_nametoindex(pair->value); - pci_dev->numa_node = numa_node; - data->dev_private = *internals; data->port_id = (*eth_dev)->data->port_id; snprintf(data->name, sizeof(data->name), "%s", (*eth_dev)->data->name); @@ -884,7 +870,6 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, error: rte_free(data); - rte_free(pci_dev); rte_free(*internals); return -1; @@ -1099,7 +1084,6 @@ rte_pmd_pcap_devuninit(const char *name) 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);