From: Kurt Kanzenbach Date: Thu, 4 Apr 2013 14:03:13 +0000 (+0200) Subject: staging: usbip: userspace: removed unnecessary code X-Git-Tag: v3.10-rc1~192^2~311 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e71e781ba4f0db19775635443a208ba69d403ad6;p=platform%2Fkernel%2Flinux-3.10.git staging: usbip: userspace: removed unnecessary code 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 Signed-off-by: Stefan Reif Signed-off-by: Greg Kroah-Hartman --- 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; }