Commit d72d7d6c authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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



To simplify the code, let's drop psci_dt_attach|detach_cpu() and use the
common dt_idle_attach|detach_cpu() directly instead.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Link: https://lore.kernel.org/r/20240228151139.2650258-1-ulf.hansson@linaro.org
parent b1d4c60c

drivers/cpuidle/cpuidle-psci-domain.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/string.h>



#include "cpuidle-psci.h"

#include "dt_idle_genpd.h"



struct psci_pd_provider {

	struct list_head link;

drivers/cpuidle/cpuidle-psci.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/cpuidle/cpuidle-psci.h

+0 −20
Original line number Diff line number Diff line
@@ -3,29 +3,9 @@ 
#ifndef __CPUIDLE_PSCI_H

#define __CPUIDLE_PSCI_H



struct device;

struct device_node;



void psci_set_domain_state(u32 state);

int psci_dt_parse_state_node(struct device_node *np, u32 *state);



#ifdef CONFIG_ARM_PSCI_CPUIDLE_DOMAIN



#include "dt_idle_genpd.h"



static inline struct device *psci_dt_attach_cpu(int cpu)

{

	return dt_idle_attach_cpu(cpu, "psci");

}



static inline void psci_dt_detach_cpu(struct device *dev)

{

	dt_idle_detach_cpu(dev);

}



#else

static inline struct device *psci_dt_attach_cpu(int cpu) { return NULL; }

static inline void psci_dt_detach_cpu(struct device *dev) { }

#endif



#endif /* __CPUIDLE_PSCI_H */