Patchwork [v2,1/2] xhci: Cleanup xhci_setup_msi() and xhci_setup_msix()

login
register
mail settings
Submitter Alexander Gordeev
Date March 7, 2014, 7:46 a.m.
Message ID <20140307074646.GA2670@dhcp-26-207.brq.redhat.com>
Download mbox | patch
Permalink /patch/327823/
State Not Applicable
Headers show

Comments

Alexander Gordeev - March 7, 2014, 7:46 a.m.
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(-)

Patch

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");