eventdev: use generic device holder

[dpdk.git] / lib / librte_eventdev / rte_eventdev.c

diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index 91bd1c9..b8be5da 100644 (file)
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -125,7 +125,7 @@ rte_event_dev_info_get(uint8_t dev_id, struct rte_event_dev_info *dev_info)
 
        dev_info->dequeue_timeout_ns = dev->data->dev_conf.dequeue_timeout_ns;
 
-       dev_info->pci_dev = dev->pci_dev;
+       dev_info->dev = dev->dev;
        if (dev->driver)
                dev_info->driver_name = dev->driver->pci_drv.driver.name;
        return 0;
@@ -798,7 +798,7 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
        }
 
        for (i = 0; i < nb_links; i++)
-               if (queues[i] >= RTE_EVENT_MAX_QUEUES_PER_DEV)
+               if (queues[i] >= dev->data->nb_queues)
                        return -EINVAL;
 
        diag = (*dev->dev_ops->port_link)(dev, dev->data->ports[port_id],
@@ -843,7 +843,7 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
        }
 
        for (i = 0; i < nb_unlinks; i++)
-               if (queues[i] >= RTE_EVENT_MAX_QUEUES_PER_DEV)
+               if (queues[i] >= dev->data->nb_queues)
                        return -EINVAL;
 
        diag = (*dev->dev_ops->port_unlink)(dev, dev->data->ports[port_id],
@@ -879,7 +879,7 @@ rte_event_port_links_get(uint8_t dev_id, uint8_t port_id,
        links_map = dev->data->links_map;
        /* Point links_map to this port specific area */
        links_map += (port_id * RTE_EVENT_MAX_QUEUES_PER_DEV);
-       for (i = 0; i < RTE_EVENT_MAX_QUEUES_PER_DEV; i++) {
+       for (i = 0; i < dev->data->nb_queues; i++) {
                if (links_map[i] != EVENT_QUEUE_SERVICE_PRIORITY_INVALID) {
                        queues[count] = i;
                        priorities[count] = (uint8_t)links_map[i];
@@ -1196,7 +1196,7 @@ rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
                                        "device data");
        }
 
-       eventdev->pci_dev = pci_dev;
+       eventdev->dev = &pci_dev->device;
        eventdev->driver = eventdrv;
 
        /* Invoke PMD device initialization function */
@@ -1250,7 +1250,7 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev)
        /* Free event device */
        rte_event_pmd_release(eventdev);
 
-       eventdev->pci_dev = NULL;
+       eventdev->dev = NULL;
        eventdev->driver = NULL;
 
        return 0;