From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752764AbbFZIrE (ORCPT ); Fri, 26 Jun 2015 04:47:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52197 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752182AbbFZIp3 (ORCPT ); Fri, 26 Jun 2015 04:45:29 -0400 Date: Fri, 26 Jun 2015 01:44:06 -0700 From: tip-bot for Markus Elfring Message-ID: Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, elfring@users.sourceforge.net, mingo@kernel.org, tglx@linutronix.de, julia.lawall@lip6.fr Reply-To: mingo@kernel.org, elfring@users.sourceforge.net, hpa@zytor.com, a.p.zijlstra@chello.nl, acme@redhat.com, linux-kernel@vger.kernel.org, julia.lawall@lip6.fr, tglx@linutronix.de In-Reply-To: <558C2ABA.3000603@users.sourceforge.net> References: <558C2ABA.3000603@users.sourceforge.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf header: Delete an unnecessary check before the calling free_event_desc() Git-Commit-ID: 4cc97614812e96c135e369f3d723fcda07d33437 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4cc97614812e96c135e369f3d723fcda07d33437 Gitweb: http://git.kernel.org/tip/4cc97614812e96c135e369f3d723fcda07d33437 Author: Markus Elfring AuthorDate: Thu, 25 Jun 2015 17:12:32 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 25 Jun 2015 15:15:49 -0300 perf header: Delete an unnecessary check before the calling free_event_desc() The free_event_desc() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring Cc: Julia Lawall Cc: Peter Zijlstra Cc: kernel-janitors@vger.kernel.org Link: http://lkml.kernel.org/r/558C2ABA.3000603@users.sourceforge.net Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 21a77e7..03ace57 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1063,8 +1063,7 @@ out: free(buf); return events; error: - if (events) - free_event_desc(events); + free_event_desc(events); events = NULL; goto out; }