From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDAAEC43387 for ; Tue, 18 Dec 2018 13:54:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A76BF218A1 for ; Tue, 18 Dec 2018 13:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726836AbeLRNx7 (ORCPT ); Tue, 18 Dec 2018 08:53:59 -0500 Received: from terminus.zytor.com ([198.137.202.136]:38269 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726740AbeLRNx6 (ORCPT ); Tue, 18 Dec 2018 08:53:58 -0500 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id wBIDrYTq2851112 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 18 Dec 2018 05:53:34 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id wBIDrYt82851109; Tue, 18 Dec 2018 05:53:34 -0800 Date: Tue, 18 Dec 2018 05:53:34 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Wen Yang Message-ID: Cc: peterz@infradead.org, hpa@zytor.com, yellowriver2010@hotmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@redhat.com, tglx@linutronix.de, julia.lawall@lip6.fr, alexander.shishkin@linux.intel.com, namhyung@kernel.org, acme@redhat.com, wen.yang99@zte.com.cn Reply-To: wen.yang99@zte.com.cn, acme@redhat.com, namhyung@kernel.org, alexander.shishkin@linux.intel.com, julia.lawall@lip6.fr, tglx@linutronix.de, jolsa@redhat.com, mingo@kernel.org, yellowriver2010@hotmail.com, linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org In-Reply-To: <20181127090610.28488-1-wen.yang99@zte.com.cn> References: <20181127090610.28488-1-wen.yang99@zte.com.cn> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf bpf: Use ERR_CAST instead of ERR_PTR(PTR_ERR()) Git-Commit-ID: 19702894cd93d79c5b5a63f56f6f417595b1a57c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 19702894cd93d79c5b5a63f56f6f417595b1a57c Gitweb: https://git.kernel.org/tip/19702894cd93d79c5b5a63f56f6f417595b1a57c Author: Wen Yang AuthorDate: Tue, 27 Nov 2018 17:06:10 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 17 Dec 2018 14:54:36 -0300 perf bpf: Use ERR_CAST instead of ERR_PTR(PTR_ERR()) 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 Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Julia Lawall Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wen Yang 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 --- tools/perf/util/bpf-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index f9ae1a993806..9a280647d829 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -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; }