OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 84... Line 84...
84 xhci->shared_hcd = usb_create_shared_hcd(driver, dev, 84 xhci->shared_hcd = usb_create_shared_hcd(driver, dev,
85 dev_name(dev), hcd); 85 dev_name(dev), hcd);
86 if (!xhci->shared_hcd) { 86 if (!xhci->shared_hcd) {
87 --- a/drivers/usb/host/xhci-pci.c 87 --- a/drivers/usb/host/xhci-pci.c
88 +++ b/drivers/usb/host/xhci-pci.c 88 +++ b/drivers/usb/host/xhci-pci.c
89 @@ -277,6 +277,9 @@ static int xhci_pci_setup(struct usb_hcd 89 @@ -266,6 +266,9 @@ static int xhci_pci_setup(struct usb_hcd
90 if (!xhci->sbrn) 90 if (!xhci->sbrn)
91 pci_read_config_byte(pdev, XHCI_SBRN_OFFSET, &xhci->sbrn); 91 pci_read_config_byte(pdev, XHCI_SBRN_OFFSET, &xhci->sbrn);
Line 92... Line 92...
92 92
93 + /* imod_interval is the interrupt moderation value in nanoseconds. */ 93 + /* imod_interval is the interrupt moderation value in nanoseconds. */
Line 110... Line 110...
110 hcd->usb_phy = devm_usb_get_phy_by_phandle(sysdev, "usb-phy", 0); 110 hcd->usb_phy = devm_usb_get_phy_by_phandle(sysdev, "usb-phy", 0);
111 if (IS_ERR(hcd->usb_phy)) { 111 if (IS_ERR(hcd->usb_phy)) {
112 ret = PTR_ERR(hcd->usb_phy); 112 ret = PTR_ERR(hcd->usb_phy);
113 --- a/drivers/usb/host/xhci.c 113 --- a/drivers/usb/host/xhci.c
114 +++ b/drivers/usb/host/xhci.c 114 +++ b/drivers/usb/host/xhci.c
115 @@ -612,11 +612,7 @@ int xhci_run(struct usb_hcd *hcd) 115 @@ -597,11 +597,7 @@ int xhci_run(struct usb_hcd *hcd)
116 "// Set the interrupt modulation register"); 116 "// Set the interrupt modulation register");
117 temp = readl(&xhci->ir_set->irq_control); 117 temp = readl(&xhci->ir_set->irq_control);
118 temp &= ~ER_IRQ_INTERVAL_MASK; 118 temp &= ~ER_IRQ_INTERVAL_MASK;
119 - /* 119 - /*
120 - * the increment interval is 8 times as much as that defined 120 - * the increment interval is 8 times as much as that defined