usb: fix some references for /proc/bus/usb
Subsystems (9)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v4 2/6 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]>
--- drivers/media/usb/pwc/philips.txt | 2 +- drivers/usb/class/Kconfig | 2 +- drivers/usb/class/usblp.c | 2 +- drivers/usb/core/devices.c | 4 ++-- drivers/usb/storage/unusual_devs.h | 2 +- include/linux/usb.h | 2 +- include/uapi/linux/capability.h | 2 +- include/uapi/linux/usb/ch9.h | 3 ++- tools/usb/usbip/README | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-)
drivers/media/usb/pwc/philips.txt +1 -1
@@ -140,7 +140,7 @@ dev_hint A camera is specified by its type (the number from the camera model, like PCA645, PCVC750VC, etc) and optionally the serial number (visible - in /proc/bus/usb/devices). A hint consists of a string with the following + in /sys/kernel/debug/usb/devices). A hint consists of a string with the following format: [type[.serialnumber]:]node
drivers/usb/class/Kconfig +1 -1
@@ -12,7 +12,7 @@ config USB_ACM Please read <file:Documentation/usb/acm.txt> for details. If your modem only reports "Cls=ff(vend.)" in the descriptors in - /proc/bus/usb/devices, then your modem will not work with this + /sys/kernel/debug/usb/devices, then your modem will not work with this driver. To compile this driver as a module, choose M here: the
drivers/usb/class/usblp.c +1 -1
@@ -294,7 +294,7 @@ static int usblp_ctrl_msg(struct usblp *usblp, int request, int type, int dir, i/* * See the description for usblp_select_alts() below for the usage -* explanation. Look into your /proc/bus/usb/devices and dmesg in +* explanation. Look into your /sys/kernel/debug/usb/devices and dmesg in * case of any trouble. */ static int proto_bias =-1 ;
drivers/usb/core/devices.c +2 -2
@@ -24,7 +24,7 @@* <mountpoint>/devices contains USB topology, device, config, class, * interface, & endpoint data. * -* I considered using /proc/bus/usb/devices/device# for each device +* I considered using /dev/bus/usb/device# for each device * as it is attached or detached, but I didn't like this for some * reason -- maybe it's just too deep of a directory structure. * I also don't like looking in multiple places to gather and view
@@ -40,7 +40,7 @@* Converted the whole proc stuff to real * read methods. Now not the whole device list needs to fit * into one page, only the device list for one bus. -* Added a poll method to /proc/bus/usb/devices, to wake +* Added a poll method to /sys/kernel/debug/usb/devices, to wake * up an eventual usbd * 2000-01-04: Thomas Sailer <[email protected]> * Turned into its own filesystem
drivers/usb/storage/unusual_devs.h +1 -1
@@ -42,7 +42,7 @@* - a patch that adds the entry for your device, including your * email address right above the entry (plus maybe a brief * explanation of the reason for the entry), -* - a copy of /proc/bus/usb/devices with your device plugged in +* - a copy of /sys/kernel/debug/usb/devices with your device plugged in * running with this patch. * Send your submission to either Phil Dibowitz <[email protected]> or * Alan Stern <[email protected]>, and don't forget to CC: the
include/linux/usb.h +1 -1
@@ -248,7 +248,7 @@ void usb_put_intf(struct usb_interface *intf);* struct usb_interface (which persists only as long as its configuration * is installed). The altsetting arrays can be accessed through these * structures at any time, permitting comparison of configurations and -* providing support for the /proc/bus/usb/devices pseudo-file. +* providing support for the /sys/kernel/debug/usb/devices pseudo-file. */ struct usb_interface_cache {unsigned num_altsetting;/* number of alternate settings */
include/uapi/linux/capability.h +1 -1
@@ -205,7 +205,7 @@ struct vfs_cap_data {#define CAP_SYS_MODULE 16/* Allow ioperm/iopl access */ -/* Allow sending USB messages to any device via /proc/bus/usb */ +/* Allow sending USB messages to any device via /dev/bus/usb */ #define CAP_SYS_RAWIO 17
include/uapi/linux/usb/ch9.h +2 -1
@@ -224,7 +224,8 @@ struct usb_ctrlrequest {* through the Linux-USB APIs, they are not converted to cpu byte * order; it is the responsibility of the client code to do this. * The single exception is when device and configuration descriptors (but -* not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD); +* not other descriptors) are read from character devices +* (i.e. /dev/bus/usb/BBB/DDD); * in this case the fields are converted to host endianness by the kernel. */
tools/usb/usbip/README +1 -1
@@ -244,7 +244,7 @@ Detach the imported device: - See 'Debug Tips' on the project wiki. - http://usbip.wiki.sourceforge.net/how-to-debug-usbip - usbip-host.ko must be bound to the target device. - - See /proc/bus/usb/devices and find "Driver=..." lines of the device. + - See /sys/kernel/debug/usb/devices and find "Driver=..." lines of the device. - Target USB gadget must be bound to vudc (using USB gadget susbsys, not usbip bind command) - Shutdown firewall.
Signature · 6 lines
2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Serge E. Hallyn
maintainerPATCH v4 2/6 usb: fix some references for /proc/bus/usb
Quoted 4 lines · Mauro Carvalho Chehab
Since when we got rid of usbfs, the
/proc/bus/usbis now elsewhere. Fix references for it.Signed-off-by Mauro Carvalho Chehab <[email protected]>
Acked-by Serge Hallyn <[email protected]>
for the capability.h update, thanks.
Quoted 141 lines
--- drivers/media/usb/pwc/philips.txt | 2 +- drivers/usb/class/Kconfig | 2 +- drivers/usb/class/usblp.c | 2 +- drivers/usb/core/devices.c | 4 ++-- drivers/usb/storage/unusual_devs.h | 2 +- include/linux/usb.h | 2 +- include/uapi/linux/capability.h | 2 +- include/uapi/linux/usb/ch9.h | 3 ++- tools/usb/usbip/README | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-)drivers/media/usb/pwc/philips.txt +1
-1@@ -140,7 +140,7 @@ dev_hint A camera is specified by its type (the number from the camera model, like PCA645, PCVC750VC, etc) and optionally the serial number (visible - in /proc/bus/usb/devices). A hint consists of a string with the following + in /sys/kernel/debug/usb/devices). A hint consists of a string with the following format: [type[.serialnumber]:]nodedrivers/usb/class/Kconfig +1
-1@@ -12,7 +12,7 @@ config USB_ACM Please read <file:Documentation/usb/acm.txt> for details. If your modem only reports "Cls=ff(vend.)" in the descriptors in - /proc/bus/usb/devices, then your modem will not work with this + /sys/kernel/debug/usb/devices, then your modem will not work with this driver. To compile this driver as a module, choose M here: thedrivers/usb/class/usblp.c +1
-1@@ -294,7 +294,7 @@ static int usblp_ctrl_msg(struct usblp *usblp, int request, int type, int dir, i/* * See the description for usblp_select_alts() below for the usage -* explanation. Look into your /proc/bus/usb/devices and dmesg in +* explanation. Look into your /sys/kernel/debug/usb/devices and dmesg in * case of any trouble. */ static int proto_bias =-1 ;drivers/usb/core/devices.c +2
-2@@ -24,7 +24,7 @@* <mountpoint>/devices contains USB topology, device, config, class, * interface, & endpoint data. * -* I considered using /proc/bus/usb/devices/device# for each device +* I considered using /dev/bus/usb/device# for each device * as it is attached or detached, but I didn't like this for some * reason -- maybe it's just too deep of a directory structure. * I also don't like looking in multiple places to gather and view @@ -40,7 +40,7 @@* Converted the whole proc stuff to real * read methods. Now not the whole device list needs to fit * into one page, only the device list for one bus. -* Added a poll method to /proc/bus/usb/devices, to wake +* Added a poll method to /sys/kernel/debug/usb/devices, to wake * up an eventual usbd * 2000-01-04: Thomas Sailer <[email protected]> * Turned into its own filesystem drivers/usb/storage/unusual_devs.h +1
-1@@ -42,7 +42,7 @@* - a patch that adds the entry for your device, including your * email address right above the entry (plus maybe a brief * explanation of the reason for the entry), -* - a copy of /proc/bus/usb/devices with your device plugged in +* - a copy of /sys/kernel/debug/usb/devices with your device plugged in * running with this patch. * Send your submission to either Phil Dibowitz <[email protected]> or * Alan Stern <[email protected]>, and don't forget to CC: the include/linux/usb.h +1
-1@@ -248,7 +248,7 @@ void usb_put_intf(struct usb_interface *intf);* struct usb_interface (which persists only as long as its configuration * is installed). The altsetting arrays can be accessed through these * structures at any time, permitting comparison of configurations and -* providing support for the /proc/bus/usb/devices pseudo-file. +* providing support for the /sys/kernel/debug/usb/devices pseudo-file. */ struct usb_interface_cache {unsigned num_altsetting;/* number of alternate settings */ include/uapi/linux/capability.h +1
-1@@ -205,7 +205,7 @@ struct vfs_cap_data {#define CAP_SYS_MODULE 16/* Allow ioperm/iopl access */ -/* Allow sending USB messages to any device via /proc/bus/usb */ +/* Allow sending USB messages to any device via /dev/bus/usb */ #define CAP_SYS_RAWIO 17include/uapi/linux/usb/ch9.h +2
-1@@ -224,7 +224,8 @@ struct usb_ctrlrequest {* through the Linux-USB APIs, they are not converted to cpu byte * order; it is the responsibility of the client code to do this. * The single exception is when device and configuration descriptors (but -* not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD); +* not other descriptors) are read from character devices +* (i.e. /dev/bus/usb/BBB/DDD); * in this case the fields are converted to host endianness by the kernel. */ tools/usb/usbip/README +1
-1@@ -244,7 +244,7 @@ Detach the imported device: - See 'Debug Tips' on the project wiki. - http://usbip.wiki.sourceforge.net/how-to-debug-usbip - usbip-host.ko must be bound to the target device. - - See /proc/bus/usb/devices and find "Driver=..." lines of the device. + - See /sys/kernel/debug/usb/devices and find "Driver=..." lines of the device. - Target USB gadget must be bound to vudc (using USB gadget susbsys, not usbip bind command) - Shutdown firewall.Signature · 1 line
2.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Greg Kroah-Hartman
maintainerPATCH v4 2/6 usb: fix some references for /proc/bus/usb
In reply to Mauro Carvalho ChehabQuoted 4 lines · Mauro Carvalho Chehab
Since when we got rid of usbfs, the
/proc/bus/usbis now elsewhere. Fix references for it.Signed-off-by Mauro Carvalho Chehab <[email protected]>
Oops, will take this one instead...
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 6/6 sound: replace /proc/bus/usb by /dev/bus/usb
In reply to a message not in the archiveThe /proc/bus/usb devices don't exist anymore, since when we got rid of usbfs. Those devices are now seen at /dev/bus/usb.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- sound/usb/usx2y/us122l.c | 2 +- sound/usb/usx2y/usX2Yhwdep.c | 2 +- sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
sound/usb/usx2y/us122l.c +1 -1
@@ -472,7 +472,7 @@ static int usb_stream_hwdep_new(struct snd_card *card) hw->ops.mmap = usb_stream_hwdep_mmap; hw->ops.poll = usb_stream_hwdep_poll; -sprintf (hw->name,"/proc/bus/usb/%03d/%03d/hwdeppcm" , +sprintf (hw->name,"/dev/bus/usb/%03d/%03d/hwdeppcm" , dev->bus->busnum, dev->devnum);return 0 ; }
sound/usb/usx2y/usX2Yhwdep.c +1 -1
@@ -258,7 +258,7 @@ int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device) hw->ops.mmap = snd_us428ctls_mmap; hw->ops.poll = snd_us428ctls_poll; hw->exclusive =1 ; -sprintf (hw->name,"/proc/bus/usb/%03d/%03d" , device->bus->busnum, device->devnum); +sprintf (hw->name,"/dev/bus/usb/%03d/%03d" , device->bus->busnum, device->devnum);return 0 ; }
sound/usb/usx2y/usx2yhwdeppcm.c +1 -1
@@ -723,7 +723,7 @@ int usX2Y_hwdep_pcm_new(struct snd_card *card) hw->ops.release = snd_usX2Y_hwdep_pcm_release; hw->ops.mmap = snd_usX2Y_hwdep_pcm_mmap; hw->exclusive =1 ; -sprintf (hw->name,"/proc/bus/usb/%03d/%03d/hwdeppcm" , dev->bus->busnum, dev->devnum); +sprintf (hw->name,"/dev/bus/usb/%03d/%03d/hwdeppcm" , dev->bus->busnum, dev->devnum); err =snd_pcm_new (card,NAME_ALLCAPS " hwdep Audio" ,2 ,1 ,1 , &pcm);if (err <0 ) {
Signature · 1 line
2.9.3
Re: [PATCH v4 6/6] sound: replace /proc/bus/usb by /dev/bus/usb
Quoted 6 lines · Mauro Carvalho Chehab
The
/proc/bus/usbdevices don't exist anymore, since when we got rid of usbfs. Those devices are now seen at/dev/bus/usb.Signed-off-by Mauro Carvalho Chehab <[email protected]>
Since it's a driver fix, I applied it to sound tree now.
thanks,
Takashi
Quoted 49 lines
--- sound/usb/usx2y/us122l.c | 2 +- sound/usb/usx2y/usX2Yhwdep.c | 2 +- sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)sound/usb/usx2y/us122l.c +1
-1@@ -472,7 +472,7 @@ static int usb_stream_hwdep_new(struct snd_card *card) hw->ops.mmap = usb_stream_hwdep_mmap; hw->ops.poll = usb_stream_hwdep_poll; -sprintf (hw->name,"/proc/bus/usb/%03d/%03d/hwdeppcm" , +sprintf (hw->name,"/dev/bus/usb/%03d/%03d/hwdeppcm" , dev->bus->busnum, dev->devnum);return 0 ; }sound/usb/usx2y/usX2Yhwdep.c +1
-1@@ -258,7 +258,7 @@ int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device) hw->ops.mmap = snd_us428ctls_mmap; hw->ops.poll = snd_us428ctls_poll; hw->exclusive =1 ; -sprintf (hw->name,"/proc/bus/usb/%03d/%03d" , device->bus->busnum, device->devnum); +sprintf (hw->name,"/dev/bus/usb/%03d/%03d" , device->bus->busnum, device->devnum);return 0 ; }sound/usb/usx2y/usx2yhwdeppcm.c +1
-1@@ -723,7 +723,7 @@ int usX2Y_hwdep_pcm_new(struct snd_card *card) hw->ops.release = snd_usX2Y_hwdep_pcm_release; hw->ops.mmap = snd_usX2Y_hwdep_pcm_mmap; hw->exclusive =1 ; -sprintf (hw->name,"/proc/bus/usb/%03d/%03d/hwdeppcm" , dev->bus->busnum, dev->devnum); +sprintf (hw->name,"/dev/bus/usb/%03d/%03d/hwdeppcm" , dev->bus->busnum, dev->devnum); err =snd_pcm_new (card,NAME_ALLCAPS " hwdep Audio" ,2 ,1 ,1 , &pcm);if (err <0 ) {Signature · 1 line
2.9.3