linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: alex.williamson@redhat.com, kvm@vger.kernel.org
Cc: linux-pci@vger.kernel.org, bsd@redhat.com, linux-kernel@vger.kernel.org
Subject: [PATCH v2 5/6] vfio-pci: Remove warning if try-reset fails
Date: Wed, 18 Mar 2015 14:13:36 -0600	[thread overview]
Message-ID: <20150318201336.24807.33423.stgit@gimli.home> (raw)
In-Reply-To: <20150318200053.24807.74115.stgit@gimli.home>

As indicated in the comment, this is not entirely uncommon and
causes user concern for no reason.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
 drivers/vfio/pci/vfio_pci.c |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 43517ce..d0f1e70 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -217,14 +217,8 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)
 	 * Try to reset the device.  The success of this is dependent on
 	 * being able to lock the device, which is not always possible.
 	 */
-	if (vdev->reset_works) {
-		int ret = pci_try_reset_function(pdev);
-		if (ret)
-			pr_warn("%s: Failed to reset device %s (%d)\n",
-				__func__, dev_name(&pdev->dev), ret);
-		else
-			vdev->needs_reset = false;
-	}
+	if (vdev->reset_works && !pci_try_reset_function(pdev))
+		vdev->needs_reset = false;
 
 	pci_restore_state(pdev);
 out:


  parent reply	other threads:[~2015-03-18 20:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-18 20:13 [PATCH v2 0/6] vfio-pci: Misc enhancements Alex Williamson
2015-03-18 20:13 ` [PATCH v2 1/6] vgaarb: Stub vga_set_legacy_decoding() Alex Williamson
2015-03-18 20:13 ` [PATCH v2 2/6] vfio-pci: Add module option to disable VGA region access Alex Williamson
2015-03-18 20:13 ` [PATCH v2 3/6] vfio-pci: Add VGA arbiter client Alex Williamson
2015-03-18 20:13 ` [PATCH v2 4/6] vfio-pci: Allow PCI IDs to be specified as module options Alex Williamson
2015-03-18 20:13 ` Alex Williamson [this message]
2015-03-18 20:13 ` [PATCH v2 6/6] vfio-pci: Move idle devices to D3hot power state Alex Williamson

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=20150318201336.24807.33423.stgit@gimli.home \
    --to=alex.williamson@redhat.com \
    --cc=bsd@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    /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).