Skip to content

Commit 59d48b3

Browse files
pmladekgregkh
authored andcommitted
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 <[email protected]> Acked-by: Alan Stern <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 32a6958 commit 59d48b3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

drivers/usb/core/hcd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,7 +2386,7 @@ void usb_hc_died (struct usb_hcd *hcd)
23862386
/* make khubd clean up old urbs and devices */
23872387
usb_set_device_state (hcd->self.root_hub,
23882388
USB_STATE_NOTATTACHED);
2389-
usb_kick_khubd (hcd->self.root_hub);
2389+
usb_kick_hub_wq(hcd->self.root_hub);
23902390
}
23912391
if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) {
23922392
hcd = hcd->shared_hcd;
@@ -2396,7 +2396,7 @@ void usb_hc_died (struct usb_hcd *hcd)
23962396
/* make khubd clean up old urbs and devices */
23972397
usb_set_device_state(hcd->self.root_hub,
23982398
USB_STATE_NOTATTACHED);
2399-
usb_kick_khubd(hcd->self.root_hub);
2399+
usb_kick_hub_wq(hcd->self.root_hub);
24002400
}
24012401
}
24022402
spin_unlock_irqrestore (&hcd_root_hub_lock, flags);

drivers/usb/core/hub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ static void kick_hub_wq(struct usb_hub *hub)
598598
kref_put(&hub->kref, hub_release);
599599
}
600600

601-
void usb_kick_khubd(struct usb_device *hdev)
601+
void usb_kick_hub_wq(struct usb_device *hdev)
602602
{
603603
struct usb_hub *hub = usb_hub_to_struct_hub(hdev);
604604

drivers/usb/core/usb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static inline unsigned usb_get_max_power(struct usb_device *udev,
4848
return c->desc.bMaxPower * mul;
4949
}
5050

51-
extern void usb_kick_khubd(struct usb_device *dev);
51+
extern void usb_kick_hub_wq(struct usb_device *dev);
5252
extern int usb_match_one_id_intf(struct usb_device *dev,
5353
struct usb_host_interface *intf,
5454
const struct usb_device_id *id);

0 commit comments

Comments
 (0)