The following commit has been merged into the perf/core branch of tip: Commit-ID: b0c76fc4cfd96ae859cc50afe5deb523276f75ae Gitweb: https://git.kernel.org/tip/b0c76fc4cfd96ae859cc50afe5deb523276f75ae Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> AuthorDate: Fri, 01 Nov 2019 18:34:44 -03:00 Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> CommitterDate: Thu, 07 Nov 2019 08:30:18 -03:00 perf symbols: Remove needless checks for map->groups->machine Its sufficient to check if map->groups is NULL before using it to get ->machine value. Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx> Cc: Jiri Olsa <jolsa@xxxxxxxxxx> Cc: Namhyung Kim <namhyung@xxxxxxxxxx> Link: https://lkml.kernel.org/n/tip-utiepyiv8b1tf8f79ok9d6j8@xxxxxxxxxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> --- tools/perf/util/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index a4bd61c..4ad39cc 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1617,7 +1617,7 @@ int dso__load(struct dso *dso, struct map *map) goto out; } - if (map->groups && map->groups->machine) + if (map->groups) machine = map->groups->machine; else machine = NULL;
|