Re: [PATCH 08/18] perf metric: Rename __metricgroup__add_metric to __add_metric

[Ian Rogers]

On Sun, Jul 12, 2020 at 6:27 AM Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
>
> Renaming __metricgroup__add_metric to __add_metric
> to fit in the current function names.
>
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>

Acked-by: Ian Rogers <irogers@xxxxxxxxxx>

Thanks,
Ian

> ---
>  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 9a168f3df7a4..f0b0a053bfd2 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;
>
> @@ -643,10 +643,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;
>
> @@ -658,9 +655,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.25.4
>