X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Flinuxapp%2Feal%2Feal_pci.c;h=5101851a4b4224443f5b3d12a4dd666884d9fec8;hb=1ce8221f37ec49434d9249a4ca25409ac4d114f7;hp=f0299574a23862360e4749b3cc513025cff8938c;hpb=ee4e23ada8cb0fcb566295756d30bd21e757c783;p=dpdk.git diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index f0299574a2..5101851a4b 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -607,12 +607,11 @@ int rte_eal_pci_ioport_map(struct rte_pci_device *dev, int bar, struct rte_pci_ioport *p) { - int ret; + int ret = -1; switch (dev->kdrv) { #ifdef VFIO_PRESENT case RTE_KDRV_VFIO: - ret = -1; if (pci_vfio_is_enabled()) ret = pci_vfio_ioport_map(dev, bar, p); break; @@ -621,14 +620,13 @@ rte_eal_pci_ioport_map(struct rte_pci_device *dev, int bar, case RTE_KDRV_UIO_GENERIC: ret = pci_uio_ioport_map(dev, bar, p); break; - default: + case RTE_KDRV_NONE: #if defined(RTE_ARCH_X86) - /* special case for x86 ... */ ret = pci_ioport_map(dev, bar, p); -#else - ret = -1; #endif break; + default: + break; } if (!ret) @@ -651,12 +649,13 @@ rte_eal_pci_ioport_read(struct rte_pci_ioport *p, case RTE_KDRV_UIO_GENERIC: pci_uio_ioport_read(p, data, len, offset); break; - default: + case RTE_KDRV_NONE: #if defined(RTE_ARCH_X86) - /* special case for x86 ... */ pci_uio_ioport_read(p, data, len, offset); #endif break; + default: + break; } } @@ -674,24 +673,24 @@ rte_eal_pci_ioport_write(struct rte_pci_ioport *p, case RTE_KDRV_UIO_GENERIC: pci_uio_ioport_write(p, data, len, offset); break; - default: + case RTE_KDRV_NONE: #if defined(RTE_ARCH_X86) - /* special case for x86 ... */ pci_uio_ioport_write(p, data, len, offset); #endif break; + default: + break; } } int rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p) { - int ret; + int ret = -1; switch (p->dev->kdrv) { #ifdef VFIO_PRESENT case RTE_KDRV_VFIO: - ret = -1; if (pci_vfio_is_enabled()) ret = pci_vfio_ioport_unmap(p); break; @@ -700,14 +699,13 @@ rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p) case RTE_KDRV_UIO_GENERIC: ret = pci_uio_ioport_unmap(p); break; - default: + case RTE_KDRV_NONE: #if defined(RTE_ARCH_X86) - /* special case for x86 ... nothing to do */ ret = 0; -#else - ret = -1; #endif break; + default: + break; } return ret;