Commit eb116f80 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Shuah Khan

selftests: kselftest: Make ksft_exit functions return void instead of int

Commit f7d5bcd3 ("selftests: kselftest: Mark functions that
unconditionally call exit() as __noreturn") marked functions that call
exit() as __noreturn but it did not change the return type of these
functions from 'void' to 'int' like it should have (since a noreturn
function by definition cannot return an integer because it does not
return...) because there were many tests that return the result of the
ksft_exit functions, even though it has never been used due to calling
exit().

Now that all uses of 'return ksft_exit...()' have been cleaned up
properly, change the types of the ksft_exit...() functions to void to
match their __noreturn nature.
Reviewed-by: default avatarMuhammad Usama Anjum <usama.anjum@collabora.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 8860d86f
...@@ -329,13 +329,13 @@ void ksft_test_result_code(int exit_code, const char *test_name, ...@@ -329,13 +329,13 @@ void ksft_test_result_code(int exit_code, const char *test_name,
break; \ break; \
} } while (0) } } while (0)
static inline __noreturn int ksft_exit_pass(void) static inline __noreturn void ksft_exit_pass(void)
{ {
ksft_print_cnts(); ksft_print_cnts();
exit(KSFT_PASS); exit(KSFT_PASS);
} }
static inline __noreturn int ksft_exit_fail(void) static inline __noreturn void ksft_exit_fail(void)
{ {
ksft_print_cnts(); ksft_print_cnts();
exit(KSFT_FAIL); exit(KSFT_FAIL);
...@@ -362,7 +362,7 @@ static inline __noreturn int ksft_exit_fail(void) ...@@ -362,7 +362,7 @@ static inline __noreturn int ksft_exit_fail(void)
ksft_cnt.ksft_xfail + \ ksft_cnt.ksft_xfail + \
ksft_cnt.ksft_xskip) ksft_cnt.ksft_xskip)
static inline __noreturn __printf(1, 2) int ksft_exit_fail_msg(const char *msg, ...) static inline __noreturn __printf(1, 2) void ksft_exit_fail_msg(const char *msg, ...)
{ {
int saved_errno = errno; int saved_errno = errno;
va_list args; va_list args;
...@@ -390,19 +390,19 @@ static inline __noreturn void ksft_exit_fail_perror(const char *msg) ...@@ -390,19 +390,19 @@ static inline __noreturn void ksft_exit_fail_perror(const char *msg)
#endif #endif
} }
static inline __noreturn int ksft_exit_xfail(void) static inline __noreturn void ksft_exit_xfail(void)
{ {
ksft_print_cnts(); ksft_print_cnts();
exit(KSFT_XFAIL); exit(KSFT_XFAIL);
} }
static inline __noreturn int ksft_exit_xpass(void) static inline __noreturn void ksft_exit_xpass(void)
{ {
ksft_print_cnts(); ksft_print_cnts();
exit(KSFT_XPASS); exit(KSFT_XPASS);
} }
static inline __noreturn __printf(1, 2) int ksft_exit_skip(const char *msg, ...) static inline __noreturn __printf(1, 2) void ksft_exit_skip(const char *msg, ...)
{ {
int saved_errno = errno; int saved_errno = errno;
va_list args; va_list args;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment