pci: fix coding style

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_pci_uio.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
index 2d1c69b..5d3354d 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
@@ -92,7 +92,8 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
 {
        int fd, i;
        struct mapped_pci_resource *uio_res;
-       struct mapped_pci_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
+       struct mapped_pci_res_list *uio_res_list =
+                       RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
 
        TAILQ_FOREACH(uio_res, uio_res_list, next) {
 
@@ -272,7 +273,8 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        uint64_t phaddr;
        struct rte_pci_addr *loc = &dev->addr;
        struct mapped_pci_resource *uio_res;
-       struct mapped_pci_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
+       struct mapped_pci_res_list *uio_res_list =
+                       RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
        struct pci_map *maps;
 
        dev->intr_handle.fd = -1;
@@ -299,7 +301,6 @@ pci_uio_map_resource(struct rte_pci_device *dev)
                        devname, strerror(errno));
                return -1;
        }
-       dev->intr_handle.type = RTE_INTR_HANDLE_UIO;
 
        snprintf(cfgname, sizeof(cfgname),
                        "/sys/class/uio/uio%u/device/config", uio_num);
@@ -310,10 +311,16 @@ pci_uio_map_resource(struct rte_pci_device *dev)
                return -1;
        }
 
-       /* set bus master that is not done by uio_pci_generic */
-       if (pci_uio_set_bus_master(dev->intr_handle.uio_cfg_fd)) {
-               RTE_LOG(ERR, EAL, "Cannot set up bus mastering!\n");
-               return -1;
+       if (dev->kdrv == RTE_KDRV_IGB_UIO)
+               dev->intr_handle.type = RTE_INTR_HANDLE_UIO;
+       else {
+               dev->intr_handle.type = RTE_INTR_HANDLE_UIO_INTX;
+
+               /* set bus master that is not done by uio_pci_generic */
+               if (pci_uio_set_bus_master(dev->intr_handle.uio_cfg_fd)) {
+                       RTE_LOG(ERR, EAL, "Cannot set up bus mastering!\n");
+                       return -1;
+               }
        }
 
        /* allocate the mapping details for secondary processes*/
@@ -412,7 +419,8 @@ static struct mapped_pci_resource *
 pci_uio_find_resource(struct rte_pci_device *dev)
 {
        struct mapped_pci_resource *uio_res;
-       struct mapped_pci_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
+       struct mapped_pci_res_list *uio_res_list =
+                       RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
 
        if (dev == NULL)
                return NULL;
@@ -431,7 +439,8 @@ void
 pci_uio_unmap_resource(struct rte_pci_device *dev)
 {
        struct mapped_pci_resource *uio_res;
-       struct mapped_pci_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
+       struct mapped_pci_res_list *uio_res_list =
+                       RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
 
        if (dev == NULL)
                return;