perf/core: Remove perf_event::group_entry

Now that all the grouping is done with RB trees, we no longer need
group_entry and can replace the whole thing with sibling_list.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Carrillo-Cisneros <davidcc@google.com>
Cc: Dmitri Prokhorov <Dmitry.Prohorov@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Valery Cherepennikov <valery.cherepennikov@intel.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

6 files changed, 7 insertions, 8 deletions

diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c
index 38f2cc2a6c74..660680d78147 100644
--- a/drivers/perf/arm_dsu_pmu.c
+++ b/drivers/perf/arm_dsu_pmu.c
@@ -536,7 +536,7 @@ static bool dsu_pmu_validate_group(struct perf_event *event)
         memset(fake_hw.used_mask, 0, sizeof(fake_hw.used_mask));
         if (!dsu_pmu_validate_event(event->pmu, &fake_hw, leader))
                 return false;
-        list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
+        list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
                 if (!dsu_pmu_validate_event(event->pmu, &fake_hw, sibling))
                         return false;
         }
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 0c2ed11c0603..628d7a7b9526 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -311,7 +311,7 @@ validate_group(struct perf_event *event)
         if (!validate_event(event->pmu, &fake_pmu, leader))
                 return -EINVAL;
 
-        list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
+        list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
                 if (!validate_event(event->pmu, &fake_pmu, sibling))
                         return -EINVAL;
         }
diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c
index 7ed24b954422..e3356087fd76 100644
--- a/drivers/perf/hisilicon/hisi_uncore_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c
@@ -82,8 +82,7 @@ static bool hisi_validate_event_group(struct perf_event *event)
                         counters++;
         }
 
-        list_for_each_entry(sibling, &event->group_leader->sibling_list,
-                            group_entry) {
+        list_for_each_entry(sibling, &event->group_leader->sibling_list, sibling_list) {
                 if (is_software_event(sibling))
                         continue;
                 if (sibling->pmu != event->pmu)
diff --git a/drivers/perf/qcom_l2_pmu.c b/drivers/perf/qcom_l2_pmu.c
index 4fdc8486a8e4..5e535a718965 100644
--- a/drivers/perf/qcom_l2_pmu.c
+++ b/drivers/perf/qcom_l2_pmu.c
@@ -535,7 +535,7 @@ static int l2_cache_event_init(struct perf_event *event)
         }
 
         list_for_each_entry(sibling, &event->group_leader->sibling_list,
-                            group_entry)
+                            sibling_list)
                 if (sibling->pmu != event->pmu &&
                     !is_software_event(sibling)) {
                         dev_dbg_ratelimited(&l2cache_pmu->pdev->dev,
@@ -572,7 +572,7 @@ static int l2_cache_event_init(struct perf_event *event)
         }
 
         list_for_each_entry(sibling, &event->group_leader->sibling_list,
-                            group_entry) {
+                            sibling_list) {
                 if ((sibling != event) &&
                     !is_software_event(sibling) &&
                     (L2_EVT_GROUP(sibling->attr.config) ==
diff --git a/drivers/perf/qcom_l3_pmu.c b/drivers/perf/qcom_l3_pmu.c
index 7f6b62b29e9d..5dedf4b1a552 100644
--- a/drivers/perf/qcom_l3_pmu.c
+++ b/drivers/perf/qcom_l3_pmu.c
@@ -468,7 +468,7 @@ static bool qcom_l3_cache__validate_event_group(struct perf_event *event)
         counters = event_num_counters(event);
         counters += event_num_counters(leader);
 
-        list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
+        list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
                 if (is_software_event(sibling))
                         continue;
                 if (sibling->pmu != event->pmu)
diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c
index eb23311bc70c..f1f4a56cab5e 100644
--- a/drivers/perf/xgene_pmu.c
+++ b/drivers/perf/xgene_pmu.c
@@ -950,7 +950,7 @@ static int xgene_perf_event_init(struct perf_event *event)
                 return -EINVAL;
 
         list_for_each_entry(sibling, &event->group_leader->sibling_list,
-                        group_entry)
+                        sibling_list)
                 if (sibling->pmu != event->pmu &&
                                 !is_software_event(sibling))
                         return -EINVAL;