Skip to content

Commit 21470e3

Browse files
mchehabgregkh
authored andcommitted
usb: fix some references for /proc/bus/usb
Since when we got rid of usbfs, the /proc/bus/usb is now elsewhere. Fix references for it. Signed-off-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Serge Hallyn <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ac9d947 commit 21470e3

File tree

9 files changed

+11
-10
lines changed

9 files changed

+11
-10
lines changed

drivers/media/usb/pwc/philips.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ dev_hint
140140

141141
A camera is specified by its type (the number from the camera model,
142142
like PCA645, PCVC750VC, etc) and optionally the serial number (visible
143-
in /proc/bus/usb/devices). A hint consists of a string with the following
143+
in /sys/kernel/debug/usb/devices). A hint consists of a string with the following
144144
format:
145145

146146
[type[.serialnumber]:]node

drivers/usb/class/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config USB_ACM
1212
Please read <file:Documentation/usb/acm.txt> for details.
1313

1414
If your modem only reports "Cls=ff(vend.)" in the descriptors in
15-
/proc/bus/usb/devices, then your modem will not work with this
15+
/sys/kernel/debug/usb/devices, then your modem will not work with this
1616
driver.
1717

1818
To compile this driver as a module, choose M here: the

drivers/usb/class/usblp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static int usblp_ctrl_msg(struct usblp *usblp, int request, int type, int dir, i
294294

295295
/*
296296
* See the description for usblp_select_alts() below for the usage
297-
* explanation. Look into your /proc/bus/usb/devices and dmesg in
297+
* explanation. Look into your /sys/kernel/debug/usb/devices and dmesg in
298298
* case of any trouble.
299299
*/
300300
static int proto_bias = -1;

drivers/usb/core/devices.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* <mountpoint>/devices contains USB topology, device, config, class,
2525
* interface, & endpoint data.
2626
*
27-
* I considered using /proc/bus/usb/devices/device# for each device
27+
* I considered using /dev/bus/usb/device# for each device
2828
* as it is attached or detached, but I didn't like this for some
2929
* reason -- maybe it's just too deep of a directory structure.
3030
* I also don't like looking in multiple places to gather and view
@@ -40,7 +40,7 @@
4040
* Converted the whole proc stuff to real
4141
* read methods. Now not the whole device list needs to fit
4242
* into one page, only the device list for one bus.
43-
* Added a poll method to /proc/bus/usb/devices, to wake
43+
* Added a poll method to /sys/kernel/debug/usb/devices, to wake
4444
* up an eventual usbd
4545
* 2000-01-04: Thomas Sailer <[email protected]>
4646
* Turned into its own filesystem

drivers/usb/storage/unusual_devs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* - a patch that adds the entry for your device, including your
4343
* email address right above the entry (plus maybe a brief
4444
* explanation of the reason for the entry),
45-
* - a copy of /proc/bus/usb/devices with your device plugged in
45+
* - a copy of /sys/kernel/debug/usb/devices with your device plugged in
4646
* running with this patch.
4747
* Send your submission to either Phil Dibowitz <[email protected]> or
4848
* Alan Stern <[email protected]>, and don't forget to CC: the

include/linux/usb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ void usb_put_intf(struct usb_interface *intf);
318318
* struct usb_interface (which persists only as long as its configuration
319319
* is installed). The altsetting arrays can be accessed through these
320320
* structures at any time, permitting comparison of configurations and
321-
* providing support for the /proc/bus/usb/devices pseudo-file.
321+
* providing support for the /sys/kernel/debug/usb/devices pseudo-file.
322322
*/
323323
struct usb_interface_cache {
324324
unsigned num_altsetting; /* number of alternate settings */

include/uapi/linux/capability.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ struct vfs_cap_data {
205205
#define CAP_SYS_MODULE 16
206206

207207
/* Allow ioperm/iopl access */
208-
/* Allow sending USB messages to any device via /proc/bus/usb */
208+
/* Allow sending USB messages to any device via /dev/bus/usb */
209209

210210
#define CAP_SYS_RAWIO 17
211211

include/uapi/linux/usb/ch9.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ struct usb_ctrlrequest {
224224
* through the Linux-USB APIs, they are not converted to cpu byte
225225
* order; it is the responsibility of the client code to do this.
226226
* The single exception is when device and configuration descriptors (but
227-
* not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD);
227+
* not other descriptors) are read from character devices
228+
* (i.e. /dev/bus/usb/BBB/DDD);
228229
* in this case the fields are converted to host endianness by the kernel.
229230
*/
230231

tools/usb/usbip/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ Detach the imported device:
244244
- See 'Debug Tips' on the project wiki.
245245
- http://usbip.wiki.sourceforge.net/how-to-debug-usbip
246246
- usbip-host.ko must be bound to the target device.
247-
- See /proc/bus/usb/devices and find "Driver=..." lines of the device.
247+
- See /sys/kernel/debug/usb/devices and find "Driver=..." lines of the device.
248248
- Target USB gadget must be bound to vudc
249249
(using USB gadget susbsys, not usbip bind command)
250250
- Shutdown firewall.

0 commit comments

Comments
 (0)