]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
perf bpf: Use ERR_CAST instead of ERR_PTR(PTR_ERR())
authorWen Yang <wen.yang99@zte.com.cn>
Tue, 27 Nov 2018 09:06:10 +0000 (17:06 +0800)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 17 Dec 2018 17:54:36 +0000 (14:54 -0300)
Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...)).  This
makes it more readable and also fix this warning detected by
err_cast.cocci:

  tools/perf/util/bpf-loader.c:1606:11-18: WARNING: ERR_CAST can be used with op

Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wen Yang <yellowriver2010@hotmail.com>
Cc: zhong.weidong@zte.com.cn
Link: http://lkml.kernel.org/r/20181127090610.28488-1-wen.yang99@zte.com.cn
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/bpf-loader.c

index f9ae1a993806bff475fef7b0558f85f710d36a82..9a280647d8292e3fdd00f8ef03eea8503dd99884 100644 (file)
@@ -1603,7 +1603,7 @@ struct perf_evsel *bpf__setup_output_event(struct perf_evlist *evlist, const cha
 
                        op = bpf_map__add_newop(map, NULL);
                        if (IS_ERR(op))
-                               return ERR_PTR(PTR_ERR(op));
+                               return ERR_CAST(op);
                        op->op_type = BPF_MAP_OP_SET_EVSEL;
                        op->v.evsel = evsel;
                }