lib: remove extra parenthesis after return

[dpdk.git] / lib / librte_eal / bsdapp / eal / eal_pci.c

diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c
index 3a0fda5..2df5c1c 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -105,12 +105,10 @@ struct uio_resource {
 
 TAILQ_HEAD(uio_res_list, uio_resource);
 
-static struct uio_res_list *uio_res_list = NULL;
-
-static struct rte_tailq_elem rte_pci_tailq = {
-       .name = "PCI_RESOURCE_LIST",
+static struct rte_tailq_elem rte_uio_tailq = {
+       .name = "UIO_RESOURCE_LIST",
 };
-EAL_REGISTER_TAILQ(rte_pci_tailq)
+EAL_REGISTER_TAILQ(rte_uio_tailq)
 
 /* unbind kernel driver for this device */
 static int
@@ -165,6 +163,7 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
 {
         size_t i;
         struct uio_resource *uio_res;
+       struct uio_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list);
 
        TAILQ_FOREACH(uio_res, uio_res_list, next) {
 
@@ -180,10 +179,10 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
                            != uio_res->maps[i].addr) {
                                RTE_LOG(ERR, EAL,
                                        "Cannot mmap device resource\n");
-                               return (-1);
+                               return -1;
                        }
                }
-               return (0);
+               return 0;
        }
 
        RTE_LOG(ERR, EAL, "Cannot find resource for device\n");
@@ -202,6 +201,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        uint64_t pagesz;
        struct rte_pci_addr *loc = &dev->addr;
        struct uio_resource *uio_res;
+       struct uio_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list);
        struct uio_map *maps;
 
        dev->intr_handle.fd = -1;
@@ -209,7 +209,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
 
        /* secondary processes - use already recorded details */
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return (pci_uio_map_secondary(dev));
+               return pci_uio_map_secondary(dev);
 
        snprintf(devname, sizeof(devname), "/dev/uio@pci:%u:%u:%u",
                        dev->addr.bus, dev->addr.devid, dev->addr.function);
@@ -233,7 +233,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        if ((uio_res = rte_zmalloc("UIO_RES", sizeof (*uio_res), 0)) == NULL) {
                RTE_LOG(ERR, EAL,
                        "%s(): cannot store uio mmap details\n", __func__);
-               return (-1);
+               return -1;
        }
 
        snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname);
@@ -261,7 +261,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
                                                (size_t)maps[j].size)
                    ) == NULL) {
                        rte_free(uio_res);
-                       return (-1);
+                       return -1;
                }
 
                maps[j].addr = mapaddr;
@@ -271,7 +271,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
 
        TAILQ_INSERT_TAIL(uio_res_list, uio_res, next);
 
-       return (0);
+       return 0;
 }
 
 /* Scan one pci sysfs entry, and fill the devices list from it. */
@@ -356,8 +356,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
                                TAILQ_INSERT_BEFORE(dev2, dev, next);
                                return 0;
                        } else { /* already registered */
-                               /* update pt_driver */
-                               dev2->pt_driver = dev->pt_driver;
+                               dev2->kdrv = dev->kdrv;
                                dev2->max_vfs = dev->max_vfs;
                                memmove(dev2->mem_resource,
                                        dev->mem_resource,
@@ -433,7 +432,7 @@ error:
 int
 rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev)
 {
-       struct rte_pci_id *id_table;
+       const struct rte_pci_id *id_table;
        int ret;
 
        for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
@@ -497,7 +496,6 @@ rte_eal_pci_init(void)
 {
        TAILQ_INIT(&pci_driver_list);
        TAILQ_INIT(&pci_device_list);
-       uio_res_list = RTE_TAILQ_CAST(rte_pci_tailq.head, uio_res_list);
 
        /* for debug purposes, PCI can be disabled */
        if (internal_config.no_pci)