Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / ehci-hub.c

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 6130b757490893a471dd3cbfa33026e8b8738071..5728829cf6ef0e631df75ba69d77ae04c5c26fbc 100644 (file)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -656,7 +656,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
 
                /*
                 * Return status information even for ports with OWNER set.
-                * Otherwise khubd wouldn't see the disconnect event when a
+                * Otherwise hub_wq wouldn't see the disconnect event when a
                 * high-speed device is switched over to the companion
                 * controller by the user.
                 */
@@ -902,7 +902,7 @@ int ehci_hub_control(
 
                /*
                 * Even if OWNER is set, so the port is owned by the
-                * companion controller, khubd needs to be able to clear
+                * companion controller, hub_wq needs to be able to clear
                 * the port-change status bits (especially
                 * USB_PORT_STAT_C_CONNECTION).
                 */
@@ -922,7 +922,7 @@ int ehci_hub_control(
 #ifdef CONFIG_USB_OTG
                        if ((hcd->self.otg_port == (wIndex + 1))
                            && hcd->self.b_hnp_enable) {
-                               otg_start_hnp(hcd->phy->otg);
+                               otg_start_hnp(hcd->usb_phy->otg);
                                break;
                        }
 #endif
@@ -1000,7 +1000,7 @@ int ehci_hub_control(
                         * However, not all EHCI implementations do this
                         * automatically, even if they _do_ support per-port
                         * power switching; they're allowed to just limit the
-                        * current.  khubd will turn the power back on.
+                        * current.  hub_wq will turn the power back on.
                         */
                        if (((temp & PORT_OC) || (ehci->need_oc_pp_cycle))
                                        && HCS_PPC(ehci->hcs_params)) {
@@ -1085,7 +1085,7 @@ int ehci_hub_control(
                }
 
                /*
-                * Even if OWNER is set, there's no harm letting khubd
+                * Even if OWNER is set, there's no harm letting hub_wq
                 * see the wPortStatus values (they should all be 0 except
                 * for PORT_POWER anyway).
                 */