All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nathan Chancellor <nathan@kernel.org>
To: shuah@kernel.org
Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Muhammad Usama Anjum <usama.anjum@collabora.com>,
	 Thomas Gleixner <tglx@linutronix.de>,
	Nathan Chancellor <nathan@kernel.org>,
	 brauner@kernel.org
Subject: [PATCH v2 01/10] selftests/clone3: ksft_exit functions do not return
Date: Wed, 24 Apr 2024 10:24:04 -0700	[thread overview]
Message-ID: <20240424-ksft-exit-int-to-void-v2-1-c35f3b8c9ca0@kernel.org> (raw)
In-Reply-To: <20240424-ksft-exit-int-to-void-v2-0-c35f3b8c9ca0@kernel.org>

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>
---
Cc: brauner@kernel.org
---
 tools/testing/selftests/clone3/clone3_clear_sighand.c | 2 +-
 tools/testing/selftests/clone3/clone3_set_tid.c       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/clone3/clone3_clear_sighand.c b/tools/testing/selftests/clone3/clone3_clear_sighand.c
index 54a8b2445be9..ce0426786828 100644
--- a/tools/testing/selftests/clone3/clone3_clear_sighand.c
+++ b/tools/testing/selftests/clone3/clone3_clear_sighand.c
@@ -120,5 +120,5 @@ int main(int argc, char **argv)
 
 	test_clone3_clear_sighand();
 
-	return ksft_exit_pass();
+	ksft_exit_pass();
 }
diff --git a/tools/testing/selftests/clone3/clone3_set_tid.c b/tools/testing/selftests/clone3/clone3_set_tid.c
index fbf813a5a06f..bfb0da2b4fdd 100644
--- a/tools/testing/selftests/clone3/clone3_set_tid.c
+++ b/tools/testing/selftests/clone3/clone3_set_tid.c
@@ -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();
 }

-- 
2.44.0


  reply	other threads:[~2024-04-24 17:24 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-24 17:24 [PATCH v2 00/10] selftests: Make ksft_exit functions return void instead of int Nathan Chancellor
2024-04-24 17:24 ` Nathan Chancellor [this message]
2024-04-24 17:24 ` [PATCH v2 02/10] selftests/ipc: ksft_exit functions do not return Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 03/10] selftests: membarrier: ksft_exit_pass() does " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 04/10] selftests/mm: ksft_exit functions do " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 05/10] selftests: pidfd: " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 06/10] selftests/resctrl: ksft_exit_skip() does " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 07/10] selftests: sync: ksft_exit_pass() " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 08/10] selftests: timers: ksft_exit functions do " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 09/10] selftests: x86: ksft_exit_pass() does " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 10/10] selftests: kselftest: Make ksft_exit functions return void instead of int Nathan Chancellor
2024-04-25 14:39 ` [PATCH v2 00/10] selftests: " Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240424-ksft-exit-int-to-void-v2-1-c35f3b8c9ca0@kernel.org \
    --to=nathan@kernel.org \
    --cc=brauner@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=shuah@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=usama.anjum@collabora.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.