Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp968435ybg; Wed, 29 Jul 2020 02:22:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkEegu/fFDZNMVjJxOMzS1VkG3McbJ7bFp8hGSteLC62JfkA1N/VumprlR5VFRKukpe/zt X-Received: by 2002:a17:906:3889:: with SMTP id q9mr31304101ejd.318.1596014528812; Wed, 29 Jul 2020 02:22:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596014528; cv=none; d=google.com; s=arc-20160816; b=F/k02v0MIHUYyT0vbEkAdEfU5+5w0qEgkEm/tjQ2Gb2mqWk2uzdpVPRn1+e4ETlF13 T4b2L4zrR5HkK5ZaQfYJi9nRT87/lNdkg4a69YVTdwslgCJ6Na8VXesZ0IWZrY7qvwXr 8wcBJxp+v0Qh9KSIydYlSZL2wXUlk27V/FO17pE93n/0FP9F+ZpeFvKO5jTjrR5lajRx e0Gn7GzgxUNn9av9kijvS/We7CoWalwZzfukl4+KhP57q1taFgGY7j5yz3grBJ2/vJtd x4vxFlsQQrC0dJWJ2QmhkTLcauuUmAKb7u1cGmstiHyJvlMYayc9rHj/THNDfl8UTjKj aYmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xghvAeMahQW23mi9HrpfI/Ddmc7Bu3dgr7o6j0Qq4VA=; b=lfA7Ljr4EAkA3kHx7+gJaZFJXRTZgeZDW4Zor/oZqVS4ev5HPUF0EE12p8VmDFy5gG 3Z3VXHo4VLnfSXskxKk/UbXHGcuvc+ZrinT3Z13jeMKs15Ek0BR5RdbgYcfOK9BsJM5R DUdyNrM7fQ8bCDj3yGl07OaLDfdHX/DmYPLh2vSXXJJPP7e/GLupn5zVFIy/2U6hcFIK wEbnA/5qFCqdju8OYtigugDks1DZhosk020/k04w51FW6DuF692Kq55/4j46KyXa2ESJ A/TB9JU/W6YzyWx/p+dV1yyFwLBhOegcwUyUjYRAx99bmSfT/L1fvlfFhNR46fMyruFA uYdw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g18si868562eds.389.2020.07.29.02.21.46; Wed, 29 Jul 2020 02:22:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728235AbgG2JTu convert rfc822-to-8bit (ORCPT + 99 others); Wed, 29 Jul 2020 05:19:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39273 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727794AbgG2JTu (ORCPT ); Wed, 29 Jul 2020 05:19:50 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275-a-VYB4izNZa9Cs_YQYPqRA-1; Wed, 29 Jul 2020 05:19:44 -0400 X-MC-Unique: a-VYB4izNZa9Cs_YQYPqRA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8020E18C63C0; Wed, 29 Jul 2020 09:19:40 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.193.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id B05B469328; Wed, 29 Jul 2020 09:19:35 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: Kajol Jain , Ian Rogers , Alexander Shishkin , Andi Kleen , John Garry , Michael Petlan , Namhyung Kim , Paul Clarke , Peter Zijlstra , Stephane Eranian , lkml , Ingo Molnar , Peter Zijlstra Subject: [PATCH 07/19] perf metric: Rename __metricgroup__add_metric to __add_metric Date: Wed, 29 Jul 2020 11:18:56 +0200 Message-Id: <20200729091908.1378911-8-jolsa@kernel.org> In-Reply-To: <20200729091908.1378911-1-jolsa@kernel.org> References: <20200729091908.1378911-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 4096be7a7a9e..ccd80538a6ae 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.25.4