From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753003AbbIPHbq (ORCPT ); Wed, 16 Sep 2015 03:31:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39414 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752909AbbIPHbb (ORCPT ); Wed, 16 Sep 2015 03:31:31 -0400 Date: Wed, 16 Sep 2015 00:31:19 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, adrian.hunter@intel.com, kan.liang@intel.com, jolsa@kernel.org Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, tglx@linutronix.de, kan.liang@intel.com, adrian.hunter@intel.com, jolsa@kernel.org In-Reply-To: <1441699142-18905-3-git-send-email-adrian.hunter@intel.com> References: <1441699142-18905-3-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Simplify set_maps() logic Git-Commit-ID: 725e06b2e2754fbff61521fa76fee51cee5bcb5f 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: 725e06b2e2754fbff61521fa76fee51cee5bcb5f Gitweb: http://git.kernel.org/tip/725e06b2e2754fbff61521fa76fee51cee5bcb5f Author: Adrian Hunter AuthorDate: Tue, 8 Sep 2015 10:58:50 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 15 Sep 2015 10:15:39 -0300 perf evlist: Simplify set_maps() logic Don't need to check for NULL when "putting" evlist->maps and evlist->threads because the "put" functions already do that. Signed-off-by: Adrian Hunter Acked-by: Jiri Olsa Cc: Kan Liang Link: http://lkml.kernel.org/r/1441699142-18905-3-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 95e07ea..9cb9296 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1156,14 +1156,10 @@ int perf_evlist__set_maps(struct perf_evlist *evlist, struct cpu_map *cpus, struct thread_map *threads) { - if (evlist->cpus) - cpu_map__put(evlist->cpus); - + cpu_map__put(evlist->cpus); evlist->cpus = cpus; - if (evlist->threads) - thread_map__put(evlist->threads); - + thread_map__put(evlist->threads); evlist->threads = threads; return perf_evlist__propagate_maps(evlist, false);