usb: hub: rename usb_kick_khubd() to usb_kick_hub_wq()

USB hub started to use a workqueue instead of kthread. Let's make it clear from
the function names.

Signed-off-by: Petr Mladek <pmladek@suse.cz>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 56a06612a5e2c6c40e2abca01fa286c48acf7eb2..761ccf02d7a0f7988827f5e604fcd0375388597c 100644 (file)
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2386,7 +2386,7 @@ void usb_hc_died (struct usb_hcd *hcd)
                /* make khubd clean up old urbs and devices */
                usb_set_device_state (hcd->self.root_hub,
                                USB_STATE_NOTATTACHED);
-               usb_kick_khubd (hcd->self.root_hub);
+               usb_kick_hub_wq(hcd->self.root_hub);
        }
        if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) {
                hcd = hcd->shared_hcd;
@@ -2396,7 +2396,7 @@ void usb_hc_died (struct usb_hcd *hcd)
                        /* make khubd clean up old urbs and devices */
                        usb_set_device_state(hcd->self.root_hub,
                                        USB_STATE_NOTATTACHED);
-                       usb_kick_khubd(hcd->self.root_hub);
+                       usb_kick_hub_wq(hcd->self.root_hub);
                }
        }
        spin_unlock_irqrestore (&hcd_root_hub_lock, flags);

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index ed7db5104bcd37e51f1192b48c33a519aa06f0a5..9b01ab2bbe7de41fcc26d84f4f918b788b64d652 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -598,7 +598,7 @@ static void kick_hub_wq(struct usb_hub *hub)
        kref_put(&hub->kref, hub_release);
 }
 
-void usb_kick_khubd(struct usb_device *hdev)
+void usb_kick_hub_wq(struct usb_device *hdev)
 {
        struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
 

diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index d9d08720c3865c4d53c1efccdce41ee52c3f94c1..b1b34d0557c91b3068d1b473885adf05d3b9f4d6 100644 (file)
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -48,7 +48,7 @@ static inline unsigned usb_get_max_power(struct usb_device *udev,
        return c->desc.bMaxPower * mul;
 }
 
-extern void usb_kick_khubd(struct usb_device *dev);
+extern void usb_kick_hub_wq(struct usb_device *dev);
 extern int usb_match_one_id_intf(struct usb_device *dev,
                                 struct usb_host_interface *intf,
                                 const struct usb_device_id *id);