[PATCH 12/15] staging: usbip: userspace: removed unnecessary code

Stefan Reif ke42caxa at cip.cs.fau.de
Thu Apr 4 14:03:13 UTC 2013


From: Kurt Kanzenbach <ly80toro at cip.cs.fau.de>

Since no usbip_name function is used in usbipd, it's not
necessary to parse "usb.ids" file at startup.

Signed-off-by: Kurt Kanzenbach <ly80toro at cip.cs.fau.de>
Signed-off-by: Stefan Reif <ke42caxa at cip.cs.fau.de>
---
 drivers/staging/usbip/userspace/src/usbipd.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/staging/usbip/userspace/src/usbipd.c b/drivers/staging/usbip/userspace/src/usbipd.c
index 3f10c51..3e913b8 100644
--- a/drivers/staging/usbip/userspace/src/usbipd.c
+++ b/drivers/staging/usbip/userspace/src/usbipd.c
@@ -436,9 +436,6 @@ static int do_standalone_mode(int daemonize)
 	struct timespec timeout;
 	sigset_t sigmask;
 
-	if (usbip_names_init(USBIDS_FILE))
-		err("failed to open %s", USBIDS_FILE);
-
 	if (usbip_host_driver_open()) {
 		err("please load " USBIP_CORE_MOD_NAME ".ko and "
 		    USBIP_HOST_DRV_NAME ".ko!");
@@ -507,7 +504,6 @@ static int do_standalone_mode(int daemonize)
 	free(fds);
 	freeaddrinfo(ai_head);
 	usbip_host_driver_close();
-	usbip_names_free();
 
 	return 0;
 }
-- 
1.8.1




More information about the devel mailing list