Commit 5db91e9c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Revert "ACPI: scan: Turn off unused power resources during initialization"

Revert commit 4b9ee772 ("ACPI: scan: Turn off unused power
resources during initialization") that is reported to cause
initialization issues to occur.
Reported-by: default avatarShujun Wang <wsj20369@163.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7e4fdeaf
...@@ -139,7 +139,6 @@ int acpi_device_sleep_wake(struct acpi_device *dev, ...@@ -139,7 +139,6 @@ int acpi_device_sleep_wake(struct acpi_device *dev,
int acpi_power_get_inferred_state(struct acpi_device *device, int *state); 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_on_resources(struct acpi_device *device, int state);
int acpi_power_transition(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 Device Power Management
......
...@@ -996,7 +996,6 @@ void acpi_resume_power_resources(void) ...@@ -996,7 +996,6 @@ void acpi_resume_power_resources(void)
mutex_unlock(&power_resource_list_lock); mutex_unlock(&power_resource_list_lock);
} }
#endif
void acpi_turn_off_unused_power_resources(void) void acpi_turn_off_unused_power_resources(void)
{ {
...@@ -1017,3 +1016,4 @@ void acpi_turn_off_unused_power_resources(void) ...@@ -1017,3 +1016,4 @@ void acpi_turn_off_unused_power_resources(void)
mutex_unlock(&power_resource_list_lock); mutex_unlock(&power_resource_list_lock);
} }
#endif
...@@ -2360,8 +2360,6 @@ int __init acpi_scan_init(void) ...@@ -2360,8 +2360,6 @@ int __init acpi_scan_init(void)
} }
} }
acpi_turn_off_unused_power_resources();
acpi_scan_initialized = true; acpi_scan_initialized = true;
out: out:
......
...@@ -8,6 +8,7 @@ extern struct list_head acpi_wakeup_device_list; ...@@ -8,6 +8,7 @@ extern struct list_head acpi_wakeup_device_list;
extern struct mutex acpi_device_lock; extern struct mutex acpi_device_lock;
extern void acpi_resume_power_resources(void); 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) static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment