selftests: pidfd: 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_{pass,fail}(), 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.

Just removing 'return' would have resulted in

  !ret ? ksft_exit_pass() : ksft_exit_fail();

so convert that into the more idiomatic

  if (ret)
    ksft_exit_fail();
  ksft_exit_pass();

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/pidfd/pidfd_fdinfo_test.c b/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c
index 01cc37bf611c3216cf9322fa9b3cb46576a2f66b..f062a986e3824d125587ab0f3190bd680be8ec46 100644 (file)
--- a/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c
+++ b/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c
@@ -307,5 +307,5 @@ int main(int argc, char **argv)
        test_pidfd_fdinfo_nspid();
        test_pidfd_dead_fdinfo();
 
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/pidfd/pidfd_open_test.c b/tools/testing/selftests/pidfd/pidfd_open_test.c
index 8a59438ccc78bf38e8a8f0b2407cf8af61fc9215..c62564c264b177af3b674a93a42301a92aef6d61 100644 (file)
--- a/tools/testing/selftests/pidfd/pidfd_open_test.c
+++ b/tools/testing/selftests/pidfd/pidfd_open_test.c
@@ -159,5 +159,7 @@ on_error:
        if (pidfd >= 0)
                close(pidfd);
 
-       return !ret ? ksft_exit_pass() : ksft_exit_fail();
+       if (ret)
+               ksft_exit_fail();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/pidfd/pidfd_poll_test.c b/tools/testing/selftests/pidfd/pidfd_poll_test.c
index 6108112753573dc4b77e611f6bfcaddefe8c2670..55d74a50358f5d1714d9e6a715f385107706908c 100644 (file)
--- a/tools/testing/selftests/pidfd/pidfd_poll_test.c
+++ b/tools/testing/selftests/pidfd/pidfd_poll_test.c
@@ -112,5 +112,5 @@ int main(int argc, char **argv)
        }
 
        ksft_test_result_pass("pidfd poll test: pass\n");
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }

diff --git a/tools/testing/selftests/pidfd/pidfd_test.c b/tools/testing/selftests/pidfd/pidfd_test.c
index c081ae91313aa2b24e3cc6eeb750624c350716d6..9faa686f90e437a9b12e1e3417c649f5a3092be9 100644 (file)
--- a/tools/testing/selftests/pidfd/pidfd_test.c
+++ b/tools/testing/selftests/pidfd/pidfd_test.c
@@ -572,5 +572,5 @@ int main(int argc, char **argv)
        test_pidfd_send_signal_exited_fail();
        test_pidfd_send_signal_recycled_pid_fail();
 
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }