summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2015-09-08 10:58:50 +0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-09-15 10:15:39 -0300
commit725e06b2e2754fbff61521fa76fee51cee5bcb5f (patch)
treeab2b6ccb4abbbfd141a8bfa44b84bb787e9078e2 /tools
parenta69b09e2342a9c144b0291b9aeb849ab7d5843bf (diff)
downloadlinux-725e06b2e2754fbff61521fa76fee51cee5bcb5f.tar.gz
linux-725e06b2e2754fbff61521fa76fee51cee5bcb5f.tar.bz2
linux-725e06b2e2754fbff61521fa76fee51cee5bcb5f.zip
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 <adrian.hunter@intel.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@intel.com> Link: http://lkml.kernel.org/r/1441699142-18905-3-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/evlist.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 95e07ea3904c..9cb9296cc4f8 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);