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 23/28] ring: remove pci device
Date: Fri, 23 Oct 2015 18:36:28 +0100	[thread overview]
Message-ID: <1445621793-3630-24-git-send-email-bernard.iremonger@intel.com> (raw)
In-Reply-To: <1445621793-3630-1-git-send-email-bernard.iremonger@intel.com>

remove rte_ring_pmd and pci_dev.

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 drivers/net/ring/rte_eth_ring.c | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index e05a459..65608b2 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -44,8 +44,6 @@
 #define ETH_RING_ACTION_CREATE		"CREATE"
 #define ETH_RING_ACTION_ATTACH		"ATTACH"
 
-static const char *ring_ethdev_driver_name = "Ring PMD";
-
 static const char *valid_arguments[] = {
 	ETH_RING_NUMA_NODE_ACTION_ARG,
 	NULL
@@ -252,15 +250,6 @@ static const struct eth_dev_ops ops = {
 	.mac_addr_add = eth_mac_addr_add,
 };
 
-static struct eth_driver rte_ring_pmd = {
-	.pci_drv = {
-		.name = "rte_ring_pmd",
-		.drv_flags = RTE_PCI_DRV_DETACHABLE,
-	},
-};
-
-static struct rte_pci_id id_table;
-
 int
 rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 		const unsigned nb_rx_queues,
@@ -269,7 +258,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 		const unsigned numa_node)
 {
 	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;
 
@@ -291,10 +279,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 	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;
@@ -322,12 +306,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 		internals->tx_ring_queues[i].rng = tx_queues[i];
 	}
 
-	rte_ring_pmd.pci_drv.name = ring_ethdev_driver_name;
-	rte_ring_pmd.pci_drv.id_table = &id_table;
-
-	pci_dev->numa_node = numa_node;
-	pci_dev->driver = &rte_ring_pmd.pci_drv;
-
 	data->dev_private = internals;
 	data->port_id = eth_dev->data->port_id;
 	memmove(data->name, eth_dev->data->name, sizeof(data->name));
@@ -354,7 +332,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 
 error:
 	rte_free(data);
-	rte_free(pci_dev);
 	rte_free(internals);
 
 	return -1;
@@ -564,7 +541,6 @@ rte_pmd_ring_devuninit(const char *name)
 	eth_dev_stop(eth_dev);
 	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);
 	return 0;
-- 
1.9.1

  parent reply	other threads:[~2015-10-23 17:57 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   ` Bernard Iremonger [this message]
2015-10-23 17:36   ` [dpdk-dev] [PATCH v5 24/28] pcap: " Bernard Iremonger
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-24-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).