LU-6245 libcfs: remove libcfsutil.h

[fs/lustre-release.git] / lnet / selftest / module.c

diff --git a/lnet/selftest/module.c b/lnet/selftest/module.c
index 215ba07..cdebec9 100644 (file)
--- a/lnet/selftest/module.c
+++ b/lnet/selftest/module.c
@@ -59,10 +59,8 @@ lnet_selftest_fini(void)
        int     i;
 
         switch (lst_init_step) {
-#ifdef __KERNEL__
                 case LST_INIT_CONSOLE:
                         lstcon_console_fini();
-#endif
                 case LST_INIT_FW:
                         sfw_shutdown();
                 case LST_INIT_RPC:
@@ -150,51 +148,21 @@ lnet_selftest_init(void)
         }
         lst_init_step = LST_INIT_FW;
 
-#ifdef __KERNEL__
         rc = lstcon_console_init();
         if (rc != 0) {
                 CERROR("LST can't startup console\n");
                 goto error;
         }
        lst_init_step = LST_INIT_CONSOLE;
-#endif
        return 0;
 error:
        lnet_selftest_fini();
        return rc;
 }
 
-#ifdef __KERNEL__
 
 MODULE_DESCRIPTION("LNet Selftest");
 MODULE_LICENSE("GPL");
 
 cfs_module(lnet, "0.9.0", lnet_selftest_init, lnet_selftest_fini);
 
-#else
-
-int
-selftest_wait_events (void)
-{
-        int evts = 0;
-
-        for (;;) {
-                /* Consume all pending events */
-                while (srpc_check_event(0))
-                        evts++;
-                evts += stt_check_events();
-                evts += swi_check_events();
-                if (evts != 0) break;
-
-                /* Nothing happened, block for events */
-                evts += srpc_check_event(stt_poll_interval());
-                /* We may have blocked, check for expired timers */
-                evts += stt_check_events();
-                if (evts == 0) /* timed out and still no event */
-                        break;
-        }
-
-        return evts;
-}
-
-#endif