[bpf-next] selftests/bpf: Suppress warning message of an unused variable.

Commit Message

Kui-Feng Lee Feb. 4, 2024, 6:12 a.m. UTC

From: Kui-Feng Lee <[e-mail]>

"r" is used to receive the return value of test_1 in bpf_testmod.c, but it
is not actually used. So, we remove "r" and change the return type to
"void".

Reported-by: kernel test robot <[e-mail]>
Closes: https://lore.kernel.org/oe-kbuild-all/[e-mail]/
Signed-off-by: Kui-Feng Lee <[e-mail]>
---
 tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c | 6 ++----
 tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.h | 2 +-
 tools/testing/selftests/bpf/progs/struct_ops_module.c | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

Comments

Yonghong Song Feb. 4, 2024, 4:46 p.m. UTC | #1

On 2/3/24 10:12 PM, [e-mail] wrote:
> From: Kui-Feng Lee <[e-mail]>
>
> "r" is used to receive the return value of test_1 in bpf_testmod.c, but it
> is not actually used. So, we remove "r" and change the return type to
> "void".
>
> Reported-by: kernel test robot <[e-mail]>
> Closes: https://lore.kernel.org/oe-kbuild-all/[e-mail]/
> Signed-off-by: Kui-Feng Lee <[e-mail]>

Acked-by: Yonghong Song <[e-mail]>

[e-mail] Feb. 5, 2024, 7 p.m. UTC | #2

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Martin KaFai Lau <[e-mail]>:

On Sat,  3 Feb 2024 22:12:04 -0800 you wrote:
> From: Kui-Feng Lee <[e-mail]>
> 
> "r" is used to receive the return value of test_1 in bpf_testmod.c, but it
> is not actually used. So, we remove "r" and change the return type to
> "void".
> 
> Reported-by: kernel test robot <[e-mail]>
> Closes: https://lore.kernel.org/oe-kbuild-all/[e-mail]/
> Signed-off-by: Kui-Feng Lee <[e-mail]>
> 
> [...]

Here is the summary with links:
  - [bpf-next] selftests/bpf: Suppress warning message of an unused variable.
    https://git.kernel.org/bpf/bpf-next/c/169e65006964

You are awesome, thank you!

Patch

diff --git a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c
index 4754c662b39f..a06daebc75c9 100644
--- a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c
+++ b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c
@@ -554,9 +554,8 @@  static const struct bpf_verifier_ops bpf_testmod_verifier_ops = {
 static int bpf_dummy_reg(void *kdata)
 {
 	struct bpf_testmod_ops *ops = kdata;
-	int r;
 
-	r = ops->test_2(4, 3);
+	ops->test_2(4, 3);
 
 	return 0;
 }
@@ -570,9 +569,8 @@  static int bpf_testmod_test_1(void)
 	return 0;
 }
 
-static int bpf_testmod_test_2(int a, int b)
+static void bpf_testmod_test_2(int a, int b)
 {
-	return 0;
 }
 
 static struct bpf_testmod_ops __bpf_testmod_ops = {
diff --git a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.h b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.h
index ca5435751c79..537beca42896 100644
--- a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.h
+++ b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.h
@@ -30,7 +30,7 @@  struct bpf_iter_testmod_seq {
 
 struct bpf_testmod_ops {
 	int (*test_1)(void);
-	int (*test_2)(int a, int b);
+	void (*test_2)(int a, int b);
 };
 
 #endif /* _BPF_TESTMOD_H */
diff --git a/tools/testing/selftests/bpf/progs/struct_ops_module.c b/tools/testing/selftests/bpf/progs/struct_ops_module.c
index e44ac55195ca..b78746b3cef3 100644
--- a/tools/testing/selftests/bpf/progs/struct_ops_module.c
+++ b/tools/testing/selftests/bpf/progs/struct_ops_module.c
@@ -16,10 +16,9 @@  int BPF_PROG(test_1)
 }
 
 SEC("struct_ops/test_2")
-int BPF_PROG(test_2, int a, int b)
+void BPF_PROG(test_2, int a, int b)
 {
 	test_2_result = a + b;
-	return a + b;
 }
 
 SEC(".struct_ops.link")