aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2011-11-03 12:03:38 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-14 19:46:06 -0500
commit968b822c0023861ef6e4e15bb68582b36e89ad29 (patch)
tree0cd7f03035bd8a7a73c59df965ee8dc552f4a5d6 /drivers/usb/host
parent2c1ce2b3fa6fe12c7804b62596a2fa63ac0b68a5 (diff)
USB: Remove the SAW_IRQ hcd flag
The HCD_FLAG_SAW_IRQ flag was introduced in order to catch IRQ routing errors: If an URB was unlinked and the host controller hadn't gotten any IRQs, it seemed likely that the IRQs were directed to the wrong vector. This warning hasn't come up in many years, as far as I know; interrupt routing now seems to be well under control. Therefore there's no reason to keep the flag around any more. This patch (as1495) finally removes it. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/hwa-hc.c1
-rw-r--r--drivers/usb/host/xhci-ring.c12
2 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
index 9bfac657572e..565d79f06e6f 100644
--- a/drivers/usb/host/hwa-hc.c
+++ b/drivers/usb/host/hwa-hc.c
@@ -776,7 +776,6 @@ static int hwahc_probe(struct usb_interface *usb_iface,
776 goto error_alloc; 776 goto error_alloc;
777 } 777 }
778 usb_hcd->wireless = 1; 778 usb_hcd->wireless = 1;
779 set_bit(HCD_FLAG_SAW_IRQ, &usb_hcd->flags);
780 wusbhc = usb_hcd_to_wusbhc(usb_hcd); 779 wusbhc = usb_hcd_to_wusbhc(usb_hcd);
781 hwahc = container_of(wusbhc, struct hwahc, wusbhc); 780 hwahc = container_of(wusbhc, struct hwahc, wusbhc);
782 hwahc_init(hwahc); 781 hwahc_init(hwahc);
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 940321b3ec68..2f8c17381c6c 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2389,17 +2389,7 @@ hw_died:
2389 2389
2390irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd) 2390irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd)
2391{ 2391{
2392 irqreturn_t ret; 2392 return xhci_irq(hcd);
2393 struct xhci_hcd *xhci;
2394
2395 xhci = hcd_to_xhci(hcd);
2396 set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
2397 if (xhci->shared_hcd)
2398 set_bit(HCD_FLAG_SAW_IRQ, &xhci->shared_hcd->flags);
2399
2400 ret = xhci_irq(hcd);
2401
2402 return ret;
2403} 2393}
2404 2394
2405/**** Endpoint Ring Operations ****/ 2395/**** Endpoint Ring Operations ****/