From e7e1badd80282ff7ee07a5176f0620f57c798934 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Sun, 19 Jul 2020 20:13:08 +0200 Subject: [PATCH] perf metric: Rename __metricgroup__add_metric to __add_metric Renaming __metricgroup__add_metric to __add_metric to fit in the current function names. Signed-off-by: Jiri Olsa Reviewed-by: Kajol Jain Acked-by: Ian Rogers Cc: Alexander Shishkin Cc: Andi Kleen Cc: John Garry Cc: Michael Petlan Cc: Namhyung Kim Cc: Paul Clarke Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lore.kernel.org/lkml/20200719181320.785305-8-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/metricgroup.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 4096be7..ccd8053 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -571,10 +571,10 @@ int __weak arch_get_runtimeparam(void) return 1; } -static int __metricgroup__add_metric(struct list_head *group_list, - struct pmu_event *pe, - bool metric_no_group, - int runtime) +static int __add_metric(struct list_head *group_list, + struct pmu_event *pe, + bool metric_no_group, + int runtime) { struct egroup *eg; @@ -634,10 +634,7 @@ static int add_metric(struct list_head *group_list, pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name); if (!strstr(pe->metric_expr, "?")) { - ret = __metricgroup__add_metric(group_list, - pe, - metric_no_group, - 1); + ret = __add_metric(group_list, pe, metric_no_group, 1); } else { int j, count; @@ -649,9 +646,7 @@ static int add_metric(struct list_head *group_list, */ for (j = 0; j < count && !ret; j++) { - ret = __metricgroup__add_metric( - group_list, pe, - metric_no_group, j); + ret = __add_metric(group_list, pe, metric_no_group, j); } } -- 2.7.4