[tip:perf/urgent] perf header: Delete an unnecessary check before the calling free_event_desc()

tip-bot for Markus Elfring
2015-06-26T08:47:04Z

Commit-ID: 4cc97614812e96c135e369f3d723fcda07d33437
Gitweb: http://git.kernel.org/tip/4cc97614812e96c135e369f3d723fcda07d33437
Author: Markus Elfring <elfring@users.sourceforge.net>
AuthorDate: Thu, 25 Jun 2015 17:12:32 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <elfring@users.sourceforge.net>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/558C2ABA.3000603@users.sourceforge.net
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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;
}