staging: usbip: userspace: removed unnecessary code
authorKurt Kanzenbach <ly80toro@cip.cs.fau.de>
Thu, 4 Apr 2013 14:03:13 +0000 (16:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Apr 2013 21:22:51 +0000 (14:22 -0700)
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@cip.cs.fau.de>
Signed-off-by: Stefan Reif <ke42caxa@cip.cs.fau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/usbip/userspace/src/usbipd.c

index 3f10c5183ffc467e50f12106887cbf5c56143231..3e913b861dc2f980d82838c9877d0db1cc23d54e 100644 (file)
@@ -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;
 }