From 2c449e380153b72e184dd253ce6470acaee53cb0 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 20 Dec 2012 14:11:15 -0500 Subject: tools/usb: remove unneeded 'continue' and simplify condition Basically remove unneeded code. Since that 'continue' is at the end of the for() there's no need for it. Signed-off-by: Sasha Levin Acked-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- tools/usb/testusb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c index 68d0734b2081..643cd77fa980 100644 --- a/tools/usb/testusb.c +++ b/tools/usb/testusb.c @@ -507,10 +507,8 @@ usage: return handle_testdev (entry) != entry; } status = pthread_create (&entry->thread, 0, handle_testdev, entry); - if (status) { + if (status) perror ("pthread_create"); - continue; - } } if (device) { struct testdev dev; -- cgit v1.2.3-58-ga151 From 9742aecda4d02976535051db4af4830bd98373a1 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Fri, 8 Feb 2013 18:48:03 +0300 Subject: testusb: remove all mentions of 'usbfs' Commit 8a424bf40d772fedacc91862ecc86f10541fabb3 (tools/usb: remove last USBFS user) removed 'usbfs' files from the source but retained mentions of 'usbfs' all over the place, most importantly in the misleading error messages printed in case USB device files are not there. Remove all the mentions of 'usbfs' for good now! Signed-off-by: Sergei Shtylyov Signed-off-by: Greg Kroah-Hartman --- tools/usb/testusb.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'tools') diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c index 643cd77fa980..879f9870a6bc 100644 --- a/tools/usb/testusb.c +++ b/tools/usb/testusb.c @@ -279,8 +279,7 @@ nomem: entry->ifnum = ifnum; - /* FIXME ask usbfs what speed; update USBDEVFS_CONNECTINFO so - * it tells about high speed etc */ + /* FIXME update USBDEVFS_CONNECTINFO so it tells about high speed etc */ fprintf(stderr, "%s speed\t%s\t%u\n", speed(entry->speed), entry->name, entry->ifnum); @@ -351,7 +350,7 @@ restart: return arg; } -static const char *usbfs_dir_find(void) +static const char *usb_dir_find(void) { static char udev_usb_path[] = "/dev/bus/usb"; @@ -380,7 +379,7 @@ int main (int argc, char **argv) int c; struct testdev *entry; char *device; - const char *usbfs_dir = NULL; + const char *usb_dir = NULL; int all = 0, forever = 0, not = 0; int test = -1 /* all */; struct usbtest_param param; @@ -407,8 +406,8 @@ int main (int argc, char **argv) case 'D': /* device, if only one */ device = optarg; continue; - case 'A': /* use all devices with specified usbfs dir */ - usbfs_dir = optarg; + case 'A': /* use all devices with specified USB dir */ + usb_dir = optarg; /* FALL THROUGH */ case 'a': /* use all devices */ device = NULL; @@ -449,7 +448,7 @@ usage: "usage: %s [options]\n" "Options:\n" "\t-D dev only test specific device\n" - "\t-A usbfs-dir\n" + "\t-A usb-dir\n" "\t-a test all recognized devices\n" "\t-l loop forever(for stress test)\n" "\t-t testnum only run specified case\n" @@ -470,18 +469,18 @@ usage: goto usage; } - /* Find usbfs mount point */ - if (!usbfs_dir) { - usbfs_dir = usbfs_dir_find(); - if (!usbfs_dir) { - fputs ("usbfs files are missing\n", stderr); + /* Find usb device subdirectory */ + if (!usb_dir) { + usb_dir = usb_dir_find(); + if (!usb_dir) { + fputs ("USB device files are missing\n", stderr); return -1; } } /* collect and list the test devices */ - if (ftw (usbfs_dir, find_testdev, 3) != 0) { - fputs ("ftw failed; is usbfs missing?\n", stderr); + if (ftw (usb_dir, find_testdev, 3) != 0) { + fputs ("ftw failed; are USB device files missing?\n", stderr); return -1; } -- cgit v1.2.3-58-ga151