drivers/net: do not use private ethdev data

[dpdk.git] / drivers / net / octeontx / octeontx_ethdev.c

diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index f829e0c..ee06cd3 100644 (file)
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -586,7 +586,7 @@ octeontx_dev_stats_reset(struct rte_eth_dev *dev)
        octeontx_port_stats_clr(nic);
 }
 
-static void
+static int
 octeontx_dev_default_mac_addr_set(struct rte_eth_dev *dev,
                                        struct ether_addr *addr)
 {
@@ -597,6 +597,8 @@ octeontx_dev_default_mac_addr_set(struct rte_eth_dev *dev,
        if (ret != 0)
                octeontx_log_err("failed to set MAC address on port %d",
                                nic->port_id);
+
+       return ret;
 }
 
 static void
@@ -1066,7 +1068,7 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
        char octtx_name[OCTEONTX_MAX_NAME_LEN];
        struct octeontx_nic *nic = NULL;
        struct rte_eth_dev *eth_dev = NULL;
-       struct rte_eth_dev_data *data = NULL;
+       struct rte_eth_dev_data *data;
        const char *name = rte_vdev_device_name(dev);
 
        PMD_INIT_FUNC_TRACE();
@@ -1082,13 +1084,6 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
                return 0;
        }
 
-       data = rte_zmalloc_socket(octtx_name, sizeof(*data), 0, socket_id);
-       if (data == NULL) {
-               octeontx_log_err("failed to allocate devdata");
-               res = -ENOMEM;
-               goto err;
-       }
-
        nic = rte_zmalloc_socket(octtx_name, sizeof(*nic), 0, socket_id);
        if (nic == NULL) {
                octeontx_log_err("failed to allocate nic structure");
@@ -1124,11 +1119,9 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
        eth_dev->data->kdrv = RTE_KDRV_NONE;
        eth_dev->data->numa_node = dev->device.numa_node;
 
-       rte_memcpy(data, (eth_dev)->data, sizeof(*data));
+       data = eth_dev->data;
        data->dev_private = nic;
-
        data->port_id = eth_dev->data->port_id;
-       snprintf(data->name, sizeof(data->name), "%s", eth_dev->data->name);
 
        nic->ev_queues = 1;
        nic->ev_ports = 1;
@@ -1147,7 +1140,6 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
                goto err;
        }
 
-       eth_dev->data = data;
        eth_dev->dev_ops = &octeontx_dev_ops;
 
        /* Finally save ethdev pointer to the NIC structure */
@@ -1215,7 +1207,6 @@ octeontx_remove(struct rte_vdev_device *dev)
 
                rte_free(eth_dev->data->mac_addrs);
                rte_free(eth_dev->data->dev_private);
-               rte_free(eth_dev->data);
                rte_eth_dev_release_port(eth_dev);
                rte_event_dev_close(nic->evdev);
        }