DPDK patches and discussions
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Cc: mauricio.vasquezbernal@studenti.polito.it,
	yuanhan.liu@linux.intel.com, huawei.xie@intel.com
Subject: [dpdk-dev] [PATCH 2/4] pci: align ioport unmap error handling to ioport map
Date: Tue, 15 Mar 2016 07:29:11 +0100	[thread overview]
Message-ID: <1458023353-22268-3-git-send-email-david.marchand@6wind.com> (raw)
In-Reply-To: <1458023353-22268-1-git-send-email-david.marchand@6wind.com>

Same idea as commit bd80d4730aca ("pci: rework ioport map error handling").

Signed-off-by: David Marchand <david.marchand@6wind.com>
---
 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

  parent reply	other threads:[~2016-03-15  6:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-15  6:29 [dpdk-dev] [PATCH 0/4] x86 ioport fixes David Marchand
2016-03-15  6:29 ` [dpdk-dev] [PATCH 1/4] pci: explicitly call ioport handlers for uio_pci_generic David Marchand
2016-03-15  6:29 ` David Marchand [this message]
2016-03-15  6:29 ` [dpdk-dev] [PATCH 3/4] pci: align ioport special case for x86 in read/write/unmap David Marchand
2016-03-15  6:29 ` [dpdk-dev] [PATCH 4/4] pci: fix ioport support for uio_pci_generic on x86 David Marchand
2016-03-16 20:21 ` [dpdk-dev] [PATCH 0/4] x86 ioport fixes Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458023353-22268-3-git-send-email-david.marchand@6wind.com \
    --to=david.marchand@6wind.com \
    --cc=dev@dpdk.org \
    --cc=huawei.xie@intel.com \
    --cc=mauricio.vasquezbernal@studenti.polito.it \
    --cc=yuanhan.liu@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).