mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	Revert "Revert "ACPI: scan: Turn off unused power resources during initialization""
Revert commit 5db91e9cb5 ("Revert "ACPI: scan: Turn off unused
power resources during initialization") which was not necessary.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
			
			
This commit is contained in:
		
							parent
							
								
									5db91e9cb5
								
							
						
					
					
						commit
						29038ae2ae
					
				
					 4 changed files with 4 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -139,6 +139,7 @@ int acpi_device_sleep_wake(struct acpi_device *dev,
 | 
			
		|||
int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
 | 
			
		||||
int acpi_power_on_resources(struct acpi_device *device, int state);
 | 
			
		||||
int acpi_power_transition(struct acpi_device *device, int state);
 | 
			
		||||
void acpi_turn_off_unused_power_resources(void);
 | 
			
		||||
 | 
			
		||||
/* --------------------------------------------------------------------------
 | 
			
		||||
                              Device Power Management
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -996,6 +996,7 @@ void acpi_resume_power_resources(void)
 | 
			
		|||
 | 
			
		||||
	mutex_unlock(&power_resource_list_lock);
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
void acpi_turn_off_unused_power_resources(void)
 | 
			
		||||
{
 | 
			
		||||
| 
						 | 
				
			
			@ -1016,4 +1017,3 @@ void acpi_turn_off_unused_power_resources(void)
 | 
			
		|||
 | 
			
		||||
	mutex_unlock(&power_resource_list_lock);
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2360,6 +2360,8 @@ int __init acpi_scan_init(void)
 | 
			
		|||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	acpi_turn_off_unused_power_resources();
 | 
			
		||||
 | 
			
		||||
	acpi_scan_initialized = true;
 | 
			
		||||
 | 
			
		||||
 out:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,6 @@ extern struct list_head acpi_wakeup_device_list;
 | 
			
		|||
extern struct mutex acpi_device_lock;
 | 
			
		||||
 | 
			
		||||
extern void acpi_resume_power_resources(void);
 | 
			
		||||
extern void acpi_turn_off_unused_power_resources(void);
 | 
			
		||||
 | 
			
		||||
static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)
 | 
			
		||||
{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue