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

Pull USB/PHY updates from Greg KH:
 "Here is the big USB and PHY driver updates for 4.11-rc1.

  Nothing major, just the normal amount of churn in the usb gadget and
  dwc and xhci controllers, new device ids, new phy drivers, a new
  usb-serial driver, and a few other minor changes in different USB
  drivers.

  All have been in linux-next for a long time with no reported issues"

* tag 'usb-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (265 commits)
  usb: cdc-wdm: remove logically dead code
  USB: serial: keyspan: drop header file
  USB: serial: io_edgeport: drop io-tables header file
  usb: musb: add code comment for clarification
  usb: misc: add USB251xB/xBi Hi-Speed Hub Controller Driver
  usb: misc: usbtest: remove redundant check on retval < 0
  USB: serial: upd78f0730: sort device ids
  USB: serial: upd78f0730: add ID for EVAL-ADXL362Z
  ohci-hub: fix typo in dbg_port macro
  usb: musb: dsps: Manage CPPI 4.1 DMA interrupt in DSPS
  usb: musb: tusb6010: Clean up tusb_omap_dma structure
  usb: musb: cppi_dma: Clean up cppi41_dma_controller structure
  usb: musb: cppi_dma: Clean up cppi structure
  usb: musb: cppi41: Detect aborted transfers in cppi41_dma_callback()
  usb: musb: dma: Add a DMA completion platform callback
  drivers: usb: usbip: Add missing break statement to switch
  usb: mtu3: remove redundant dev_err call in get_ssusb_rscs()
  USB: serial: mos7840: fix another NULL-deref at open
  USB: serial: console: clean up sanity checks
  USB: serial: console: fix uninitialised spinlock
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 4fc8c603afb8..9564bc76c56f 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -111,7 +111,7 @@ static int dwc2_get_dr_mode(struct dwc2_hsotg *hsotg)
 
         if (mode != hsotg->dr_mode) {
                 dev_warn(hsotg->dev,
-                        "Configuration mismatch. dr_mode forced to %s\n",
+                         "Configuration mismatch. dr_mode forced to %s\n",
                         mode == USB_DR_MODE_HOST ? "host" : "device");
 
                 hsotg->dr_mode = mode;
@@ -136,11 +136,11 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
                         return ret;
         }
 
-        if (hsotg->uphy)
+        if (hsotg->uphy) {
                 ret = usb_phy_init(hsotg->uphy);
-        else if (hsotg->plat && hsotg->plat->phy_init)
+        } else if (hsotg->plat && hsotg->plat->phy_init) {
                 ret = hsotg->plat->phy_init(pdev, hsotg->plat->phy_type);
-        else {
+        } else {
                 ret = phy_power_on(hsotg->phy);
                 if (ret == 0)
                         ret = phy_init(hsotg->phy);
@@ -170,11 +170,11 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg)
         struct platform_device *pdev = to_platform_device(hsotg->dev);
         int ret = 0;
 
-        if (hsotg->uphy)
+        if (hsotg->uphy) {
                 usb_phy_shutdown(hsotg->uphy);
-        else if (hsotg->plat && hsotg->plat->phy_exit)
+        } else if (hsotg->plat && hsotg->plat->phy_exit) {
                 ret = hsotg->plat->phy_exit(pdev, hsotg->plat->phy_type);
-        else {
+        } else {
                 ret = phy_exit(hsotg->phy);
                 if (ret == 0)
                         ret = phy_power_off(hsotg->phy);
@@ -445,7 +445,7 @@ static int dwc2_driver_probe(struct platform_device *dev)
         }
 
         if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) {
-                retval = dwc2_hcd_init(hsotg, hsotg->irq);
+                retval = dwc2_hcd_init(hsotg);
                 if (retval) {
                         if (hsotg->gadget_enabled)
                                 dwc2_hsotg_remove(hsotg);