]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests/clone3: ksft_exit functions do not return
authorNathan Chancellor <nathan@kernel.org>
Wed, 24 Apr 2024 17:24:04 +0000 (10:24 -0700)
committerShuah Khan <skhan@linuxfoundation.org>
Mon, 6 May 2024 19:57:20 +0000 (13:57 -0600)
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>
tools/testing/selftests/clone3/clone3_clear_sighand.c
tools/testing/selftests/clone3/clone3_set_tid.c

index 54a8b2445be99fb3aca46401ee27a5fe47aaa5ce..ce042678682888c8d278f87014a7e580f8a61a48 100644 (file)
@@ -120,5 +120,5 @@ int main(int argc, char **argv)
 
        test_clone3_clear_sighand();
 
-       return ksft_exit_pass();
+       ksft_exit_pass();
 }
index fbf813a5a06fd488120f84291301c823f7282bf4..bfb0da2b4fdd17733f11d600d4d99c390b49d821 100644 (file)
@@ -412,5 +412,7 @@ int main(int argc, char *argv[])
 out:
        ret = 0;
 
-       return !ret ? ksft_exit_pass() : ksft_exit_fail();
+       if (ret)
+               ksft_exit_fail();
+       ksft_exit_pass();
 }