From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Marchand Subject: [PATCH 2/4] pci: align ioport unmap error handling to ioport map Date: Tue, 15 Mar 2016 07:29:11 +0100 Message-ID: <1458023353-22268-3-git-send-email-david.marchand@6wind.com> References: <1458023353-22268-1-git-send-email-david.marchand@6wind.com> Cc: mauricio.vasquezbernal@studenti.polito.it, yuanhan.liu@linux.intel.com, huawei.xie@intel.com To: dev@dpdk.org Return-path: Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by dpdk.org (Postfix) with ESMTP id 4ED6A5589 for ; Tue, 15 Mar 2016 07:29:47 +0100 (CET) Received: by mail-wm0-f46.google.com with SMTP id l68so137396393wml.0 for ; Mon, 14 Mar 2016 23:29:47 -0700 (PDT) In-Reply-To: <1458023353-22268-1-git-send-email-david.marchand@6wind.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Same idea as commit bd80d4730aca ("pci: rework ioport map error handling"). Signed-off-by: David Marchand --- lib/librte_eal/linuxapp/eal/eal_pci.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index e2af371..7707292 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -690,12 +690,11 @@ rte_eal_pci_ioport_write(struct rte_pci_ioport *p, 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; @@ -710,8 +709,6 @@ rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p) #if defined(RTE_ARCH_X86) /* special case for x86 ... nothing to do */ ret = 0; -#else - ret = -1; #endif break; } -- 1.9.1