selftests: timers: ksft_exit functions do not return

After commit f7d5bcd35d42 ("selftests: kselftest: Mark functions that
unconditionally call exit() as __noreturn"), ksft_exit_...() functions
are marked as __noreturn, which means the return type should not be
'int' but 'void' because they are not returning anything (and never were
since exit() has always been called).

To facilitate updating the return type of these functions, remove
'return' before the calls to ksft_exit_...(), as __noreturn prevents the
compiler from warning that a caller of the ksft_exit functions does not
return a value because the program will terminate upon calling these
functions.

Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/selftests/timers/adjtick.c b/tools/testing/selftests/timers/adjtick.c
index 47e05fdc32c58085c461437d1a2e469be87fac73..205b76a4abb4c0add8be0e081c2dc097311252d6 100644 (file)
--- a/tools/testing/selftests/timers/adjtick.c
+++ b/tools/testing/selftests/timers/adjtick.c
@@ -205,7 +205,7 @@ int main(int argc, char **argv)
        adjtimex(&tx1);
 
        if (err)
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/alarmtimer-suspend.c b/tools/testing/selftests/timers/alarmtimer-suspend.c
index 4332b494103d34a96b38d06413075466e67c5f3f..ad52e608b88ea0881a7d26cfda7b8de94aa0ebb3 100644 (file)
--- a/tools/testing/selftests/timers/alarmtimer-suspend.c
+++ b/tools/testing/selftests/timers/alarmtimer-suspend.c
@@ -173,6 +173,6 @@ int main(void)
                timer_delete(tm1);
        }
        if (final_ret)
-               return ksft_exit_fail();
-       return ksft_exit_pass();
+               ksft_exit_fail();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/change_skew.c b/tools/testing/selftests/timers/change_skew.c
index 992a77f2a74ca041da03ce6768aa5d826dd6c40f..4421cd562c246da3c7a675b9ee555cd1b7cc44e5 100644 (file)
--- a/tools/testing/selftests/timers/change_skew.c
+++ b/tools/testing/selftests/timers/change_skew.c
@@ -89,8 +89,8 @@ int main(int argc, char **argv)
 
        if (ret) {
                printf("[FAIL]");
-               return ksft_exit_fail();
+               ksft_exit_fail();
        }
        printf("[OK]");
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/freq-step.c b/tools/testing/selftests/timers/freq-step.c
index 4b76450d78d1eee31911e844cfbb3c6663d07f57..73b636f89fdc295b5fb156e1ad29920f898fd7bb 100644 (file)
--- a/tools/testing/selftests/timers/freq-step.c
+++ b/tools/testing/selftests/timers/freq-step.c
@@ -257,7 +257,7 @@ int main(int argc, char **argv)
        set_frequency(0.0);
 
        if (fails)
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/leap-a-day.c b/tools/testing/selftests/timers/leap-a-day.c
index 23eb398c8140ae0a9efb637fcc8ecaf331f47a23..986abbdb15217b9f2b25d14931c49d50cb065364 100644 (file)
--- a/tools/testing/selftests/timers/leap-a-day.c
+++ b/tools/testing/selftests/timers/leap-a-day.c
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
                if (ret < 0) {
                        printf("Error: Problem setting STA_INS/STA_DEL!: %s\n",
                                                        time_state_str(ret));
-                       return ksft_exit_fail();
+                       ksft_exit_fail();
                }
 
                /* Validate STA_INS was set */
@@ -277,7 +277,7 @@ int main(int argc, char **argv)
                if (tx.status != STA_INS && tx.status != STA_DEL) {
                        printf("Error: STA_INS/STA_DEL not set!: %s\n",
                                                        time_state_str(ret));
-                       return ksft_exit_fail();
+                       ksft_exit_fail();
                }
 
                if (tai_time) {
@@ -295,7 +295,7 @@ int main(int argc, char **argv)
                se.sigev_value.sival_int = 0;
                if (timer_create(CLOCK_REALTIME, &se, &tm1) == -1) {
                        printf("Error: timer_create failed\n");
-                       return ksft_exit_fail();
+                       ksft_exit_fail();
                }
                its1.it_value.tv_sec = next_leap;
                its1.it_value.tv_nsec = 0;
@@ -366,7 +366,7 @@ int main(int argc, char **argv)
                if (error_found) {
                        printf("Errors observed\n");
                        clear_time_state();
-                       return ksft_exit_fail();
+                       ksft_exit_fail();
                }
                printf("\n");
                if ((iterations != -1) && !(--iterations))
@@ -374,5 +374,5 @@ int main(int argc, char **argv)
        }
 
        clear_time_state();
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/leapcrash.c b/tools/testing/selftests/timers/leapcrash.c
index f70802c5dd0d67e16596db582ffb6850575dd4fa..8fd065eec9044d9d4e66949cf19021ec3a9537f5 100644 (file)
--- a/tools/testing/selftests/timers/leapcrash.c
+++ b/tools/testing/selftests/timers/leapcrash.c
@@ -87,7 +87,7 @@ int main(void)
                tv.tv_usec = 0;
                if (settimeofday(&tv, NULL)) {
                        printf("Error: You're likely not running with proper (ie: root) permissions\n");
-                       return ksft_exit_fail();
+                       ksft_exit_fail();
                }
                tx.modes = 0;
                adjtimex(&tx);
@@ -104,5 +104,5 @@ int main(void)
                fflush(stdout);
        }
        printf("[OK]\n");
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/mqueue-lat.c b/tools/testing/selftests/timers/mqueue-lat.c
index 7916cf5cc6fff189708caeb61804d25381b558dd..f3179a605bba99f4f7992d8c12da77ca0e4464ad 100644 (file)
--- a/tools/testing/selftests/timers/mqueue-lat.c
+++ b/tools/testing/selftests/timers/mqueue-lat.c
@@ -107,8 +107,8 @@ int main(int argc, char **argv)
        ret = mqueue_lat_test();
        if (ret < 0) {
                printf("[FAILED]\n");
-               return ksft_exit_fail();
+               ksft_exit_fail();
        }
        printf("[OK]\n");
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/posix_timers.c b/tools/testing/selftests/timers/posix_timers.c
index c001dd79179d5d28e51d69cbad4c7e9a6a026053..07c81c0093c0a4c92e721c5ff338f9d57e0be3da 100644 (file)
--- a/tools/testing/selftests/timers/posix_timers.c
+++ b/tools/testing/selftests/timers/posix_timers.c
@@ -260,16 +260,16 @@ int main(int argc, char **argv)
        ksft_print_msg("based timers if other threads run on the CPU...\n");
 
        if (check_itimer(ITIMER_VIRTUAL) < 0)
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
        if (check_itimer(ITIMER_PROF) < 0)
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
        if (check_itimer(ITIMER_REAL) < 0)
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
        if (check_timer_create(CLOCK_THREAD_CPUTIME_ID) < 0)
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
        /*
         * It's unfortunately hard to reliably test a timer expiration
@@ -281,10 +281,10 @@ int main(int argc, char **argv)
         * find a better solution.
         */
        if (check_timer_create(CLOCK_PROCESS_CPUTIME_ID) < 0)
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
        if (check_timer_distribution() < 0)
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
        ksft_finished();
 }

diff --git a/tools/testing/selftests/timers/raw_skew.c b/tools/testing/selftests/timers/raw_skew.c
index 6eba203f9da7b545c920c4f655bb37438f396aee..030143eb09b43ff73a76513d4d19457cb572155f 100644 (file)
--- a/tools/testing/selftests/timers/raw_skew.c
+++ b/tools/testing/selftests/timers/raw_skew.c
@@ -137,11 +137,11 @@ int main(int argc, char **argv)
                if (tx1.offset || tx2.offset ||
                    tx1.freq != tx2.freq || tx1.tick != tx2.tick) {
                        printf("        [SKIP]\n");
-                       return ksft_exit_skip("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n");
+                       ksft_exit_skip("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n");
                }
                printf("        [FAILED]\n");
-               return ksft_exit_fail();
+               ksft_exit_fail();
        }
        printf("        [OK]\n");
-       return  ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/set-2038.c b/tools/testing/selftests/timers/set-2038.c
index 688cfd81b5319f482328a015810a93d1a6707c45..f7d978721b9e03f2f05d544563918c0decbc51b5 100644 (file)
--- a/tools/testing/selftests/timers/set-2038.c
+++ b/tools/testing/selftests/timers/set-2038.c
@@ -128,6 +128,6 @@ out:
        /* restore clock */
        settime(start);
        if (ret)
-               return ksft_exit_fail();
-       return ksft_exit_pass();
+               ksft_exit_fail();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/set-tai.c b/tools/testing/selftests/timers/set-tai.c
index 8c4179ee2ca294a48a4cd9686cbd9377f6434e3d..5b67462efcd6cd7c7c91d31789be5a79083d784a 100644 (file)
--- a/tools/testing/selftests/timers/set-tai.c
+++ b/tools/testing/selftests/timers/set-tai.c
@@ -61,9 +61,9 @@ int main(int argc, char **argv)
                ret = get_tai();
                if (ret != i) {
                        printf("[FAILED] expected: %i got %i\n", i, ret);
-                       return ksft_exit_fail();
+                       ksft_exit_fail();
                }
        }
        printf("[OK]\n");
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/set-timer-lat.c b/tools/testing/selftests/timers/set-timer-lat.c
index 50da45437daab0b5785a4925ac793644cb9d02fd..7ce240c89b21908ce955e7a28c5932e7a92cc89a 100644 (file)
--- a/tools/testing/selftests/timers/set-timer-lat.c
+++ b/tools/testing/selftests/timers/set-timer-lat.c
@@ -278,6 +278,6 @@ int main(void)
                ret |= do_timer_oneshot(clock_id, 0);
        }
        if (ret)
-               return ksft_exit_fail();
-       return ksft_exit_pass();
+               ksft_exit_fail();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/set-tz.c b/tools/testing/selftests/timers/set-tz.c
index 62bd33eb16f0a5754255c11651c11dc288550f52..20daaf1782b763216426c1cd4ad7d2a26f4ca42d 100644 (file)
--- a/tools/testing/selftests/timers/set-tz.c
+++ b/tools/testing/selftests/timers/set-tz.c
@@ -102,9 +102,9 @@ int main(int argc, char **argv)
        printf("[OK]\n");
 
        set_tz(min, dst);
-       return ksft_exit_pass();
+       ksft_exit_pass();
 
 err:
        set_tz(min, dst);
-       return ksft_exit_fail();
+       ksft_exit_fail();
 }

diff --git a/tools/testing/selftests/timers/skew_consistency.c b/tools/testing/selftests/timers/skew_consistency.c
index 63913f75b384573d086b8fe5fc42e67ab6bd20bd..c8e6bffe4e0a144bdf4ff10e50ae19ea9bd0a41a 100644 (file)
--- a/tools/testing/selftests/timers/skew_consistency.c
+++ b/tools/testing/selftests/timers/skew_consistency.c
@@ -70,8 +70,8 @@ int main(int argc, char **argv)
 
        if (ret) {
                printf("[FAILED]\n");
-               return ksft_exit_fail();
+               ksft_exit_fail();
        }
        printf("[OK]\n");
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/threadtest.c b/tools/testing/selftests/timers/threadtest.c
index 80aed4bf06fba35cf2885eb81d85a3358b1fada9..76b38e41d9c7fa34bfc2c80dd4d23cb810654fbc 100644 (file)
--- a/tools/testing/selftests/timers/threadtest.c
+++ b/tools/testing/selftests/timers/threadtest.c
@@ -189,5 +189,5 @@ out:
        /* die */
        if (ret)
                ksft_exit_fail();
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c
index d13ebde203221ae3fa81835fae684c8e180cf111..d500884801d852298480b9dd1d7ab1287c2ea3d6 100644 (file)
--- a/tools/testing/selftests/timers/valid-adjtimex.c
+++ b/tools/testing/selftests/timers/valid-adjtimex.c
@@ -320,10 +320,10 @@ int validate_set_offset(void)
 int main(int argc, char **argv)
 {
        if (validate_freq())
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
        if (validate_set_offset())
-               return ksft_exit_fail();
+               ksft_exit_fail();
 
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }