Messages in this thread Patch in this message | | | Date | Wed, 16 Sep 2015 00:31:19 -0700 | From | tip-bot for Adrian Hunter <> | Subject | [tip:perf/core] perf evlist: Simplify set_maps() logic |
| |
Commit-ID: 725e06b2e2754fbff61521fa76fee51cee5bcb5f Gitweb: http://git.kernel.org/tip/725e06b2e2754fbff61521fa76fee51cee5bcb5f Author: Adrian Hunter <adrian.hunter@intel.com> AuthorDate: Tue, 8 Sep 2015 10:58:50 +0300 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> 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 <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> --- 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);
| |