DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bernard Iremonger <bernard.iremonger@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v5 24/28] pcap: remove pci device
Date: Fri, 23 Oct 2015 18:36:29 +0100	[thread overview]
Message-ID: <1445621793-3630-25-git-send-email-bernard.iremonger@intel.com> (raw)
In-Reply-To: <1445621793-3630-1-git-send-email-bernard.iremonger@intel.com>

remove rte_pcap_pmd and pci_dev.

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 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);
 
-- 
1.9.1

  parent reply	other threads:[~2015-10-23 17:58 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <PATCH v5>
2015-10-23 17:36 ` [dpdk-dev] [PATCH v5 00/28] remove pci driver from vdevs Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 01/28] librte_eal: add RTE_KDRV_NONE for vdevs Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 02/28] librte_ether: add fields from rte_pci_driver to rte_eth_dev_data Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 03/28] librte_ether: add function rte_eth_copy_dev_info Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 04/28] ixgbe: copy pci device info to eth_dev data Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 05/28] e1000: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 06/28] i40e: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 07/28] fm10k: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 08/28] bnx2x: " Bernard Iremonger
2015-10-23 22:37     ` Harish Patil
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 09/28] cxgbe: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 10/28] enic: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 11/28] mlx4: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 12/28] virtio: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 13/28] vmxnet3: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 14/28] null: copy " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 15/28] ring: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 16/28] pcap: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 17/28] af_packet: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 18/28] xenvirt: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 19/28] mpipe: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 20/28] bonding: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 21/28] librte_ether: remove branches on pci_dev Bernard Iremonger
2015-10-29 11:51     ` Bruce Richardson
2015-10-29 14:32       ` Iremonger, Bernard
2015-10-29 14:35         ` Bruce Richardson
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 22/28] null: remove pci device Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 23/28] ring: " Bernard Iremonger
2015-10-23 17:36   ` Bernard Iremonger [this message]
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 25/28] af_packet: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 26/28] xenvirt: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 27/28] mpipe: " Bernard Iremonger
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 28/28] bonding: " Bernard Iremonger
2015-10-29 12:18   ` [dpdk-dev] [PATCH v5 00/28] remove pci driver from vdevs Bruce Richardson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445621793-3630-25-git-send-email-bernard.iremonger@intel.com \
    --to=bernard.iremonger@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).