mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	ACPI / idle: remove usage of the statedata
Len Brown sent a patch to remove this field in the intel_idle driver. The other user of this field is the davinci cpuidle driver and a patch has been sent to remove the usage of it. This patch removes the last user of this field. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
		
							parent
							
								
									6ef0f086be
								
							
						
					
					
						commit
						ac3ebafa81
					
				
					 1 changed files with 7 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -66,6 +66,8 @@ module_param(latency_factor, uint, 0644);
 | 
			
		|||
 | 
			
		||||
static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device);
 | 
			
		||||
 | 
			
		||||
static struct acpi_processor_cx *acpi_cstate[CPUIDLE_STATE_MAX];
 | 
			
		||||
 | 
			
		||||
static int disabled_by_idle_boot_param(void)
 | 
			
		||||
{
 | 
			
		||||
	return boot_option_idle_override == IDLE_POLL ||
 | 
			
		||||
| 
						 | 
				
			
			@ -721,8 +723,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
 | 
			
		|||
		struct cpuidle_driver *drv, int index)
 | 
			
		||||
{
 | 
			
		||||
	struct acpi_processor *pr;
 | 
			
		||||
	struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
 | 
			
		||||
	struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
 | 
			
		||||
	struct acpi_processor_cx *cx = acpi_cstate[index];
 | 
			
		||||
 | 
			
		||||
	pr = __this_cpu_read(processors);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -745,8 +746,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
 | 
			
		|||
 */
 | 
			
		||||
static int acpi_idle_play_dead(struct cpuidle_device *dev, int index)
 | 
			
		||||
{
 | 
			
		||||
	struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
 | 
			
		||||
	struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
 | 
			
		||||
	struct acpi_processor_cx *cx = acpi_cstate[index];
 | 
			
		||||
 | 
			
		||||
	ACPI_FLUSH_CPU_CACHE();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -776,8 +776,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
 | 
			
		|||
		struct cpuidle_driver *drv, int index)
 | 
			
		||||
{
 | 
			
		||||
	struct acpi_processor *pr;
 | 
			
		||||
	struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
 | 
			
		||||
	struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
 | 
			
		||||
	struct acpi_processor_cx *cx = acpi_cstate[index];
 | 
			
		||||
 | 
			
		||||
	pr = __this_cpu_read(processors);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -835,8 +834,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
 | 
			
		|||
		struct cpuidle_driver *drv, int index)
 | 
			
		||||
{
 | 
			
		||||
	struct acpi_processor *pr;
 | 
			
		||||
	struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
 | 
			
		||||
	struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
 | 
			
		||||
	struct acpi_processor_cx *cx = acpi_cstate[index];
 | 
			
		||||
 | 
			
		||||
	pr = __this_cpu_read(processors);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -935,7 +933,6 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
 | 
			
		|||
{
 | 
			
		||||
	int i, count = CPUIDLE_DRIVER_STATE_START;
 | 
			
		||||
	struct acpi_processor_cx *cx;
 | 
			
		||||
	struct cpuidle_state_usage *state_usage;
 | 
			
		||||
 | 
			
		||||
	if (!pr->flags.power_setup_done)
 | 
			
		||||
		return -EINVAL;
 | 
			
		||||
| 
						 | 
				
			
			@ -954,7 +951,6 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
 | 
			
		|||
 | 
			
		||||
	for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
 | 
			
		||||
		cx = &pr->power.states[i];
 | 
			
		||||
		state_usage = &dev->states_usage[count];
 | 
			
		||||
 | 
			
		||||
		if (!cx->valid)
 | 
			
		||||
			continue;
 | 
			
		||||
| 
						 | 
				
			
			@ -965,8 +961,7 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
 | 
			
		|||
		    !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
 | 
			
		||||
			continue;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
		cpuidle_set_statedata(state_usage, cx);
 | 
			
		||||
		acpi_cstate[count] = cx;
 | 
			
		||||
 | 
			
		||||
		count++;
 | 
			
		||||
		if (count == CPUIDLE_STATE_MAX)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue