Commit 59d48b3f authored by Petr Mladek's avatar Petr Mladek Committed by Greg Kroah-Hartman
Browse files

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: default avatarPetr Mladek <pmladek@suse.cz>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32a69589

drivers/usb/core/hcd.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/usb/core/hub.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/usb/core/usb.h

+1 −1
Original line number Diff line number Diff line
@@ -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);