diff options
author | Petr Mladek <pmladek@suse.cz> | 2014-09-19 11:32:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-24 01:33:19 -0400 |
commit | 37ebb54915dc42944f6ae92fe53b9531c3903801 (patch) | |
tree | 5e81856de30454af836ff583ec96e3a34591c312 /Documentation/usb | |
parent | 59d48b3f1fdf307115af38b91c3ea4ddb57b73a2 (diff) |
usb: hub: rename khubd to hub_wq in documentation and comments
USB hub has started to use a workqueue instead of kthread. Let's update
the documentation and comments here and there.
This patch mostly just replaces "khubd" with "hub_wq". There are only few
exceptions where the whole sentence was updated. These more complicated
changes can be found in the following files:
Documentation/usb/hotplug.txt
drivers/net/usb/usbnet.c
drivers/usb/core/hcd.c
drivers/usb/host/ohci-hcd.c
drivers/usb/host/xhci.c
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>
Diffstat (limited to 'Documentation/usb')
-rw-r--r-- | Documentation/usb/WUSB-Design-overview.txt | 6 | ||||
-rw-r--r-- | Documentation/usb/hotplug.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/usb/WUSB-Design-overview.txt b/Documentation/usb/WUSB-Design-overview.txt index 512238c3dc86..fdb47637720e 100644 --- a/Documentation/usb/WUSB-Design-overview.txt +++ b/Documentation/usb/WUSB-Design-overview.txt | |||
@@ -308,7 +308,7 @@ HC picks the /DN_Connect/ out (nep module sends to notif.c for delivery | |||
308 | into /devconnect/). This process starts the authentication process for | 308 | into /devconnect/). This process starts the authentication process for |
309 | the device. First we allocate a /fake port/ and assign an | 309 | the device. First we allocate a /fake port/ and assign an |
310 | unauthenticated address (128 to 255--what we really do is | 310 | unauthenticated address (128 to 255--what we really do is |
311 | 0x80 | fake_port_idx). We fiddle with the fake port status and /khubd/ | 311 | 0x80 | fake_port_idx). We fiddle with the fake port status and /hub_wq/ |
312 | sees a new connection, so he moves on to enable the fake port with a reset. | 312 | sees a new connection, so he moves on to enable the fake port with a reset. |
313 | 313 | ||
314 | So now we are in the reset path -- we know we have a non-yet enumerated | 314 | So now we are in the reset path -- we know we have a non-yet enumerated |
@@ -317,7 +317,7 @@ device with an unauthorized address; we ask user space to authenticate | |||
317 | exchange (FIXME: not yet done) and issue a /set address 0/ to bring the | 317 | exchange (FIXME: not yet done) and issue a /set address 0/ to bring the |
318 | device to the default state. Device is authenticated. | 318 | device to the default state. Device is authenticated. |
319 | 319 | ||
320 | From here, the USB stack takes control through the usb_hcd ops. khubd | 320 | From here, the USB stack takes control through the usb_hcd ops. hub_wq |
321 | has seen the port status changes, as we have been toggling them. It will | 321 | has seen the port status changes, as we have been toggling them. It will |
322 | start enumerating and doing transfers through usb_hcd->urb_enqueue() to | 322 | start enumerating and doing transfers through usb_hcd->urb_enqueue() to |
323 | read descriptors and move our data. | 323 | read descriptors and move our data. |
@@ -331,7 +331,7 @@ Keep Alive IE; it responds with a /DN_Alive/ pong during the DNTS (this | |||
331 | arrives to us as a notification through | 331 | arrives to us as a notification through |
332 | devconnect.c:wusb_handle_dn_alive(). If a device times out, we | 332 | devconnect.c:wusb_handle_dn_alive(). If a device times out, we |
333 | disconnect it from the system (cleaning up internal information and | 333 | disconnect it from the system (cleaning up internal information and |
334 | toggling the bits in the fake hub port, which kicks khubd into removing | 334 | toggling the bits in the fake hub port, which kicks hub_wq into removing |
335 | the rest of the stuff). | 335 | the rest of the stuff). |
336 | 336 | ||
337 | This is done through devconnect:__wusb_check_devs(), which will scan the | 337 | This is done through devconnect:__wusb_check_devs(), which will scan the |
diff --git a/Documentation/usb/hotplug.txt b/Documentation/usb/hotplug.txt index a80b0e9a7a0b..5b243f315b2c 100644 --- a/Documentation/usb/hotplug.txt +++ b/Documentation/usb/hotplug.txt | |||
@@ -58,7 +58,7 @@ USB POLICY AGENT | |||
58 | 58 | ||
59 | The USB subsystem currently invokes /sbin/hotplug when USB devices | 59 | The USB subsystem currently invokes /sbin/hotplug when USB devices |
60 | are added or removed from system. The invocation is done by the kernel | 60 | are added or removed from system. The invocation is done by the kernel |
61 | hub daemon thread [khubd], or else as part of root hub initialization | 61 | hub workqueue [hub_wq], or else as part of root hub initialization |
62 | (done by init, modprobe, kapmd, etc). Its single command line parameter | 62 | (done by init, modprobe, kapmd, etc). Its single command line parameter |
63 | is the string "usb", and it passes these environment variables: | 63 | is the string "usb", and it passes these environment variables: |
64 | 64 | ||