diff options
| author |   Wang Hai <wanghai38@huawei.com> | 2021-06-09 19:56:51 +0800 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2021-06-11 15:30:52 -0700 |
| commit | 3b3af91cb6893967bbec30f5c14562d0f7f00c2a (patch) | |
| tree | 8f48fa14b9c91d8dfb5be3ac6a85a04942fb9738 /tools/lib | |
| parent | selftests, bpf: Make docs tests fail more reliably (diff) | |
| download | linux-dev-3b3af91cb6893967bbec30f5c14562d0f7f00c2a.tar.xz linux-dev-3b3af91cb6893967bbec30f5c14562d0f7f00c2a.zip | |
libbpf: Simplify the return expression of bpf_object__init_maps function
There is no need for special treatment of the 'ret == 0' case.
This patch simplifies the return expression.
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210609115651.3392580-1-wanghai38@huawei.com
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 65f87cc1220c..128715b8794b 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2465,10 +2465,8 @@ static int bpf_object__init_maps(struct bpf_object *obj, err = err ?: bpf_object__init_global_data_maps(obj); err = err ?: bpf_object__init_kconfig_map(obj); err = err ?: bpf_object__init_struct_ops_maps(obj); - if (err) - return err; - return 0; + return err; } static bool section_have_execinstr(struct bpf_object *obj, int idx) |