Skip to content

Commit e7e1bad

Browse files
olsajiriacmel
authored andcommitted
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 <jolsa@kernel.org> Reviewed-by: Kajol Jain <kjain@linux.ibm.com> Acked-by: Ian Rogers <irogers@google.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: John Garry <john.garry@huawei.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Clarke <pc@us.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lore.kernel.org/lkml/20200719181320.785305-8-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent a29c164 commit e7e1bad

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

tools/perf/util/metricgroup.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -571,10 +571,10 @@ int __weak arch_get_runtimeparam(void)
571571
return 1;
572572
}
573573

574-
static int __metricgroup__add_metric(struct list_head *group_list,
575-
struct pmu_event *pe,
576-
bool metric_no_group,
577-
int runtime)
574+
static int __add_metric(struct list_head *group_list,
575+
struct pmu_event *pe,
576+
bool metric_no_group,
577+
int runtime)
578578
{
579579
struct egroup *eg;
580580

@@ -634,10 +634,7 @@ static int add_metric(struct list_head *group_list,
634634
pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);
635635

636636
if (!strstr(pe->metric_expr, "?")) {
637-
ret = __metricgroup__add_metric(group_list,
638-
pe,
639-
metric_no_group,
640-
1);
637+
ret = __add_metric(group_list, pe, metric_no_group, 1);
641638
} else {
642639
int j, count;
643640

@@ -649,9 +646,7 @@ static int add_metric(struct list_head *group_list,
649646
*/
650647

651648
for (j = 0; j < count && !ret; j++) {
652-
ret = __metricgroup__add_metric(
653-
group_list, pe,
654-
metric_no_group, j);
649+
ret = __add_metric(group_list, pe, metric_no_group, j);
655650
}
656651
}
657652

0 commit comments

Comments
 (0)