libbpf: Simplify the return expression of bpf_object__init_maps function
authorWang Hai <wanghai38@huawei.com>
Wed, 9 Jun 2021 11:56:51 +0000 (19:56 +0800)
committerAndrii Nakryiko <andrii@kernel.org>
Fri, 11 Jun 2021 22:30:52 +0000 (15:30 -0700)
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
tools/lib/bpf/libbpf.c

index 65f87cc..128715b 100644 (file)
@@ -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)