leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/usb: remove last USBFS user

Browse Source 
In commit fb28d58b ("USB: remove CONFIG_USB_DEVICEFS") USBFS got
removed. Since it is gone we can stop using it in testusb and try udev
nodes right away.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sebastian Andrzej Siewior 2012-09-10 09:16:39 +02:00 committed by Greg Kroah-Hartman
parent 0837e7e527
commit 8a424bf40d
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/usb/testusb.c
View File

@ -253,9 +253,6 @@ static int find_testdev(const char *name, const struct stat *sb, int flag)
if (flag != FTW_F) if (flag != FTW_F)
return 0; return 0;
/* ignore /proc/bus/usb/{devices,drivers} */
if (strrchr(name, '/')[1] == 'd')
return 0;
fd = fopen(name, "rb"); fd = fopen(name, "rb");
if (!fd) { if (!fd) {
@ -356,28 +353,8 @@ restart:
static const char *usbfs_dir_find(void) static const char *usbfs_dir_find(void)
{ {
static char usbfs_path_0[] = "/dev/usb/devices";
static char usbfs_path_1[] = "/proc/bus/usb/devices";
static char udev_usb_path[] = "/dev/bus/usb"; static char udev_usb_path[] = "/dev/bus/usb";
static char *const usbfs_paths[] = {
usbfs_path_0, usbfs_path_1
};
static char *const *
end = usbfs_paths + sizeof usbfs_paths / sizeof *usbfs_paths;
char *const *it = usbfs_paths;
do {
int fd = open(*it, O_RDONLY);
close(fd);
if (fd >= 0) {
strrchr(*it, '/')[0] = '\0';
return *it;
}
} while (++it != end);
/* real device-nodes managed by udev */
if (access(udev_usb_path, F_OK) == 0) if (access(udev_usb_path, F_OK) == 0)
return udev_usb_path; return udev_usb_path;
@ -489,7 +466,7 @@ usage:
goto usage; goto usage;
if (!all && !device) { if (!all && !device) {
fprintf (stderr, "must specify '-a' or '-D dev', " fprintf (stderr, "must specify '-a' or '-D dev', "
"or DEVICE=/proc/bus/usb/BBB/DDD in env\n"); "or DEVICE=/dev/bus/usb/BBB/DDD in env\n");
goto usage; goto usage;
} }