From patchwork Fri Oct 30 15:08:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 8437 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 0D7ED958E; Fri, 30 Oct 2015 16:09:37 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id E797B93C0 for ; Fri, 30 Oct 2015 16:09:23 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 30 Oct 2015 08:09:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,219,1444719600"; d="scan'208";a="823204948" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 30 Oct 2015 08:09:22 -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 t9UF9LUf009344; Fri, 30 Oct 2015 15:09:21 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t9UF9LDr010327; Fri, 30 Oct 2015 15:09:21 GMT Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id t9UF9L3q010323; Fri, 30 Oct 2015 15:09:21 GMT From: Bernard Iremonger To: dev@dpdk.org Date: Fri, 30 Oct 2015 15:08:48 +0000 Message-Id: <1446217733-9887-24-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 23/28] ring: 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_ring_pmd and pci_dev. Signed-off-by: Bernard Iremonger Acked-by: Bruce Richardson --- 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 77ac23a..faa5759 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;