summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn-Thorben Hinz <jthinz@mailbox.tu-berlin.de>2022-07-26 15:32:03 +0200
committerAndrii Nakryiko <andrii@kernel.org>2022-07-29 10:43:14 -0700
commita6df06744b2d0b953615e0d6ca8b5e84ae4019fc (patch)
treea7c81928940a37cfc768a5d8df8ee2722d2d133e
parent5eff8c18f124e47da0be79fb2b776e1c2cac0b07 (diff)
downloadlinux-a6df06744b2d0b953615e0d6ca8b5e84ae4019fc.tar.bz2
bpftool: Don't try to return value from void function in skeleton
A skeleton generated by bpftool previously contained a return followed by an expression in OBJ_NAME__detach(), which has return type void. This did not hurt, the bpf_object__detach_skeleton() called there returns void itself anyway, but led to a warning when compiling with e.g. -pedantic. Signed-off-by: Jörn-Thorben Hinz <jthinz@mailbox.tu-berlin.de> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Reviewed-by: Quentin Monnet <quentin@isovalent.com> Link: https://lore.kernel.org/bpf/20220726133203.514087-1-jthinz@mailbox.tu-berlin.de
-rw-r--r--tools/bpf/bpftool/gen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c
index 1cf53bb01936..7070dcffa822 100644
--- a/tools/bpf/bpftool/gen.c
+++ b/tools/bpf/bpftool/gen.c
@@ -1175,7 +1175,7 @@ static int do_skeleton(int argc, char **argv)
static inline void \n\
%1$s__detach(struct %1$s *obj) \n\
{ \n\
- return bpf_object__detach_skeleton(obj->skeleton); \n\
+ bpf_object__detach_skeleton(obj->skeleton); \n\
} \n\
",
obj_name