[PATCH v3 07/10] perf/x86/rapl: Add an argument to the cleanup and init functions

[Dhananjay Ugwekar]

Prep for per-core RAPL PMU addition.

No functional change.

Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwe...@amd.com>
---
 arch/x86/events/rapl.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 70c7b35fb4d2..f815c60ec551 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -687,7 +687,7 @@ static void __init rapl_advertise(void)
        }
 }
 
-static void cleanup_rapl_pmus(void)
+static void cleanup_rapl_pmus(struct rapl_pmus *rapl_pmus)
 {
        int i;
 
@@ -705,8 +705,10 @@ static const struct attribute_group *rapl_attr_update[] = {
        NULL,
 };
 
-static int __init init_rapl_pmus(void)
+static int __init init_rapl_pmus(struct rapl_pmus **rapl_pmus_ptr)
 {
+       struct rapl_pmus *rapl_pmus;
+
        int nr_rapl_pmu = topology_max_packages() * 
topology_max_dies_per_package();
 
        if (rapl_pmu_is_pkg_scope())
@@ -728,6 +730,9 @@ static int __init init_rapl_pmus(void)
        rapl_pmus->pmu.read             = rapl_pmu_event_read;
        rapl_pmus->pmu.module           = THIS_MODULE;
        rapl_pmus->pmu.capabilities     = PERF_PMU_CAP_NO_EXCLUDE;
+
+       *rapl_pmus_ptr = rapl_pmus;
+
        return 0;
 }
 
@@ -869,7 +874,7 @@ static int __init rapl_pmu_init(void)
        if (ret)
                return ret;
 
-       ret = init_rapl_pmus();
+       ret = init_rapl_pmus(&rapl_pmus);
        if (ret)
                return ret;
 
@@ -893,7 +898,7 @@ static int __init rapl_pmu_init(void)
        cpuhp_remove_state(CPUHP_AP_PERF_X86_RAPL_ONLINE);
 out:
        pr_warn("Initialization failed (%d), disabled\n", ret);
-       cleanup_rapl_pmus();
+       cleanup_rapl_pmus(rapl_pmus);
        return ret;
 }
 module_init(rapl_pmu_init);
@@ -902,6 +907,6 @@ static void __exit intel_rapl_exit(void)
 {
        cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_RAPL_ONLINE);
        perf_pmu_unregister(&rapl_pmus->pmu);
-       cleanup_rapl_pmus();
+       cleanup_rapl_pmus(rapl_pmus);
 }
 module_exit(intel_rapl_exit);
-- 
2.34.1