From: Alexander Gordeev <agordeev@redhat.com>
To: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-pci@vger.kernel.org, "Nyman,
Mathias" <mathias.nyman@intel.com>,
Dan Williams <dan.j.williams@intel.com>
Subject: [PATCH v2 1/2] xhci: Cleanup xhci_setup_msi() and xhci_setup_msix()
Date: Fri, 7 Mar 2014 08:46:46 +0100 [thread overview]
Message-ID: <20140307074646.GA2670@dhcp-26-207.brq.redhat.com> (raw)
In-Reply-To: <20140306215646.GA23294@xanatos>
Make xhci_setup_msi() and xhci_setup_msix() functions
return error code in a consistent and more clear way.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Cc: linux-pci@vger.kernel.org
---
drivers/usb/host/xhci.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 6fe577d..6fbba7a 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -232,9 +232,10 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"disable MSI interrupt");
pci_disable_msi(pdev);
+ return ret;
}
- return ret;
+ return 0;
}
/*
@@ -307,7 +308,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
}
hcd->msix_enabled = 1;
- return ret;
+ return 0;
disable_msix:
xhci_dbg_trace(xhci, trace_xhci_dbg_init, "disable MSI-X interrupt");
--
1.7.7.6
--
Regards,
Alexander Gordeev
agordeev@redhat.com
next prev parent reply other threads:[~2014-03-07 7:44 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1394128952.git.agordeev@redhat.com>
2014-03-06 20:11 ` [PATCH v2 RESEND 1/4] ioat: Use pci_enable_msix_exact() instead of pci_enable_msix() Alexander Gordeev
2014-03-06 21:09 ` Dan Williams
2014-03-06 21:43 ` Alexander Gordeev
2014-03-06 21:50 ` Dan Williams
2014-03-07 7:49 ` [PATCH v2] " Alexander Gordeev
2014-04-21 13:36 ` Alexander Gordeev
2014-08-25 16:35 ` Alexander Gordeev
2014-08-25 16:31 ` Dan Williams
2014-03-06 20:11 ` [PATCH v2 RESEND 2/4] portdrv: " Alexander Gordeev
2014-03-13 3:56 ` Bjorn Helgaas
2014-04-14 16:18 ` Alexander Gordeev
2014-03-06 20:11 ` [PATCH v2 RESEND 3/4] tsi721: " Alexander Gordeev
2014-03-07 13:35 ` Bounine, Alexandre
2014-04-21 13:28 ` Alexander Gordeev
2014-03-06 20:11 ` [PATCH v2 RESEND 4/4] xhci: " Alexander Gordeev
2014-03-06 21:56 ` Sarah Sharp
2014-03-07 7:46 ` Alexander Gordeev [this message]
2014-03-07 7:48 ` [PATCH v2 2/2] " Alexander Gordeev
2014-03-25 14:27 ` [PATCH v2 RESEND 4/4] " Alexander Gordeev
2014-04-02 11:41 ` Alexander Gordeev
2014-04-02 14:05 ` Mathias Nyman
2014-04-02 15:20 ` Alexander Gordeev
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=20140307074646.GA2670@dhcp-26-207.brq.redhat.com \
--to=agordeev@redhat.com \
--cc=dan.j.williams@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=sarah.a.sharp@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).