aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2011-12-22 18:02:13 -0500
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-12-22 18:52:43 -0500
commit3b9783b277e66731891ab42eeaacebbdcdd6e629 (patch)
tree54f0c453781a9b7eb004a563a5dd07fa96d660dc /drivers/usb/host
parent2a9227a5eeaeb3f91e3a72ceea4fa59016ca5d20 (diff)
xhci: Remove warnings about MSI and MSI-X capabilities.
xHCI host controllers may not be capable of MSI, but they should be able to be used in legacy PCI interrupt mode. Similarly, some xHCI host controllers will have MSI support but not MSI-X support. Lower the dmesg log level from an error to debug. The message won't appear unless CONFIG_USB_XHCI_HCD_DEBUGGING is turned on. If we need to find out whether the device can support MSI or MSI-X and it's not being enabled by the driver, it's easy to ask the user to run lspci. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/xhci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index a1afb7c39f7e..0968b856ef0a 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -200,14 +200,14 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)
200 200
201 ret = pci_enable_msi(pdev); 201 ret = pci_enable_msi(pdev);
202 if (ret) { 202 if (ret) {
203 xhci_err(xhci, "failed to allocate MSI entry\n"); 203 xhci_dbg(xhci, "failed to allocate MSI entry\n");
204 return ret; 204 return ret;
205 } 205 }
206 206
207 ret = request_irq(pdev->irq, (irq_handler_t)xhci_msi_irq, 207 ret = request_irq(pdev->irq, (irq_handler_t)xhci_msi_irq,
208 0, "xhci_hcd", xhci_to_hcd(xhci)); 208 0, "xhci_hcd", xhci_to_hcd(xhci));
209 if (ret) { 209 if (ret) {
210 xhci_err(xhci, "disable MSI interrupt\n"); 210 xhci_dbg(xhci, "disable MSI interrupt\n");
211 pci_disable_msi(pdev); 211 pci_disable_msi(pdev);
212 } 212 }
213 213
@@ -270,7 +270,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
270 270
271 ret = pci_enable_msix(pdev, xhci->msix_entries, xhci->msix_count); 271 ret = pci_enable_msix(pdev, xhci->msix_entries, xhci->msix_count);
272 if (ret) { 272 if (ret) {
273 xhci_err(xhci, "Failed to enable MSI-X\n"); 273 xhci_dbg(xhci, "Failed to enable MSI-X\n");
274 goto free_entries; 274 goto free_entries;
275 } 275 }
276 276
@@ -286,7 +286,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
286 return ret; 286 return ret;
287 287
288disable_msix: 288disable_msix:
289 xhci_err(xhci, "disable MSI-X interrupt\n"); 289 xhci_dbg(xhci, "disable MSI-X interrupt\n");
290 xhci_free_irq(xhci); 290 xhci_free_irq(xhci);
291 pci_disable_msix(pdev); 291 pci_disable_msix(pdev);
292free_entries: 292free_entries: