remove rte_null_pmd and pci_dev.

Signed-off-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 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 2ca27ba..525fa2d 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);

-- 
1.9.1

Reply via email to