Merge tag 'usb-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB patches from Greg KH:
 "Here's the big pull request for the USB driver tree for 3.20-rc1.

  Nothing major happening here, just lots of gadget driver updates, new
  device ids, and a bunch of cleanups.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (299 commits)
  usb: musb: fix device hotplug behind hub
  usb: dwc2: Fix a bug in reading the endpoint directions from reg.
  staging: emxx_udc: fix the build error
  usb: Retry port status check on resume to work around RH bugs
  Revert "usb: Reset USB-3 devices on USB-3 link bounce"
  uhci-hub: use HUB_CHAR_*
  usb: kconfig: replace PPC_OF with PPC
  ehci-pci: disable for Intel MID platforms (update)
  usb: gadget: Kconfig: use bool instead of boolean
  usb: musb: blackfin: remove incorrect __exit_p()
  USB: fix use-after-free bug in usb_hcd_unlink_urb()
  ehci-pci: disable for Intel MID platforms
  usb: host: pci_quirks: joing string literals
  USB: add flag for HCDs that can't receive wakeup requests (isp1760-hcd)
  USB: usbfs: allow URBs to be reaped after disconnection
  cdc-acm: kill unnecessary messages
  cdc-acm: add sanity checks
  usb: phy: phy-generic: Fix USB PHY gpio reset
  usb: dwc2: fix USB core dependencies
  usb: renesas_usbhs: fix NULL pointer dereference in dma_release_channel()
  ...

1 files changed, 25 insertions, 21 deletions

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index ce636466edb7..f9400564cb72 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -603,9 +603,9 @@ static void quirk_usb_handoff_ohci(struct pci_dev *pdev)
                         msleep(10);
                 }
                 if (wait_time <= 0)
-                        dev_warn(&pdev->dev, "OHCI: BIOS handoff failed"
-                                        " (BIOS bug?) %08x\n",
-                                        readl(base + OHCI_CONTROL));
+                        dev_warn(&pdev->dev,
+                                 "OHCI: BIOS handoff failed (BIOS bug?) %08x\n",
+                                 readl(base + OHCI_CONTROL));
         }
 #endif
 
@@ -733,8 +733,9 @@ static void ehci_bios_handoff(struct pci_dev *pdev,
                  * and hope nothing goes too wrong
                  */
                 if (try_handoff)
-                        dev_warn(&pdev->dev, "EHCI: BIOS handoff failed"
-                                 " (BIOS bug?) %08x\n", cap);
+                        dev_warn(&pdev->dev,
+                                 "EHCI: BIOS handoff failed (BIOS bug?) %08x\n",
+                                 cap);
                 pci_write_config_byte(pdev, offset + 2, 0);
         }
 
@@ -781,8 +782,9 @@ static void quirk_usb_disable_ehci(struct pci_dev *pdev)
                 case 0: /* Illegal reserved cap, set cap=0 so we exit */
                         cap = 0; /* then fallthrough... */
                 default:
-                        dev_warn(&pdev->dev, "EHCI: unrecognized capability "
-                                 "%02x\n", cap & 0xff);
+                        dev_warn(&pdev->dev,
+                                 "EHCI: unrecognized capability %02x\n",
+                                 cap & 0xff);
                 }
                 offset = (cap >> 8) & 0xff;
         }
@@ -893,8 +895,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)
          */
         if (!IS_ENABLED(CONFIG_USB_XHCI_HCD)) {
                 dev_warn(&xhci_pdev->dev,
-                                "CONFIG_USB_XHCI_HCD is turned off, "
-                                "defaulting to EHCI.\n");
+                         "CONFIG_USB_XHCI_HCD is turned off, defaulting to EHCI.\n");
                 dev_warn(&xhci_pdev->dev,
                                 "USB 3.0 devices will work at USB 2.0 speeds.\n");
                 usb_disable_xhci_ports(xhci_pdev);
@@ -919,8 +920,9 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)
 
         pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,
                         &ports_available);
-        dev_dbg(&xhci_pdev->dev, "USB 3.0 ports that are now enabled "
-                        "under xHCI: 0x%x\n", ports_available);
+        dev_dbg(&xhci_pdev->dev,
+                "USB 3.0 ports that are now enabled under xHCI: 0x%x\n",
+                ports_available);
 
         /* Read XUSB2PRM, xHCI USB 2.0 Port Routing Mask Register
          * Indicate the USB 2.0 ports to be controlled by the xHCI host.
@@ -941,8 +943,9 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)
 
         pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,
                         &ports_available);
-        dev_dbg(&xhci_pdev->dev, "USB 2.0 ports that are now switched over "
-                        "to xHCI: 0x%x\n", ports_available);
+        dev_dbg(&xhci_pdev->dev,
+                "USB 2.0 ports that are now switched over to xHCI: 0x%x\n",
+                ports_available);
 }
 EXPORT_SYMBOL_GPL(usb_enable_intel_xhci_ports);
 
@@ -1010,8 +1013,9 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
 
                 /* Assume a buggy BIOS and take HC ownership anyway */
                 if (timeout) {
-                        dev_warn(&pdev->dev, "xHCI BIOS handoff failed"
-                                        " (BIOS bug ?) %08x\n", val);
+                        dev_warn(&pdev->dev,
+                                 "xHCI BIOS handoff failed (BIOS bug ?) %08x\n",
+                                 val);
                         writel(val & ~XHCI_HC_BIOS_OWNED, base + ext_cap_offset);
                 }
         }
@@ -1039,8 +1043,8 @@ hc_init:
         if (timeout) {
                 val = readl(op_reg_base + XHCI_STS_OFFSET);
                 dev_warn(&pdev->dev,
-                                "xHCI HW not ready after 5 sec (HC bug?) "
-                                "status = 0x%x\n", val);
+                         "xHCI HW not ready after 5 sec (HC bug?) status = 0x%x\n",
+                         val);
         }
 
         /* Send the halt and disable interrupts command */
@@ -1054,8 +1058,8 @@ hc_init:
         if (timeout) {
                 val = readl(op_reg_base + XHCI_STS_OFFSET);
                 dev_warn(&pdev->dev,
-                                "xHCI HW did not halt within %d usec "
-                                "status = 0x%x\n", XHCI_MAX_HALT_USEC, val);
+                         "xHCI HW did not halt within %d usec status = 0x%x\n",
+                         XHCI_MAX_HALT_USEC, val);
         }
 
         iounmap(base);
@@ -1075,8 +1079,8 @@ static void quirk_usb_early_handoff(struct pci_dev *pdev)
                 return;
 
         if (pci_enable_device(pdev) < 0) {
-                dev_warn(&pdev->dev, "Can't enable PCI device, "
-                                "BIOS handoff failed.\n");
+                dev_warn(&pdev->dev,
+                         "Can't enable PCI device, BIOS handoff failed.\n");
                 return;
         }
         if (pdev->class == PCI_CLASS_SERIAL_USB_UHCI)