cpuidle: psci: Drop superfluous wrappers psci_dt_attach|detach_cpu()

[linux-2.6-block.git] / drivers / cpuidle / cpuidle-psci.c

diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c
index bf68920d038ae28fea90ca804d7972d4b7ecd2b5..782030a27703116fd0adeff4ce2123d05d60dc1a 100644 (file)
--- a/drivers/cpuidle/cpuidle-psci.c
+++ b/drivers/cpuidle/cpuidle-psci.c
@@ -28,6 +28,7 @@
 
 #include "cpuidle-psci.h"
 #include "dt_idle_states.h"
+#include "dt_idle_genpd.h"
 
 struct psci_cpuidle_data {
        u32 *psci_states;
@@ -224,7 +225,7 @@ static int psci_dt_cpu_init_topology(struct cpuidle_driver *drv,
        if (IS_ENABLED(CONFIG_PREEMPT_RT))
                return 0;
 
-       data->dev = psci_dt_attach_cpu(cpu);
+       data->dev = dt_idle_attach_cpu(cpu, "psci");
        if (IS_ERR_OR_NULL(data->dev))
                return PTR_ERR_OR_ZERO(data->dev);
 
@@ -311,7 +312,7 @@ static void psci_cpu_deinit_idle(int cpu)
 {
        struct psci_cpuidle_data *data = per_cpu_ptr(&psci_cpuidle_data, cpu);
 
-       psci_dt_detach_cpu(data->dev);
+       dt_idle_detach_cpu(data->dev);
        psci_cpuidle_use_cpuhp = false;
 }