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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Revert commit 5db91e9cb5b3 ("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>

Rafael J. Wysocki 4 years ago 29038ae2 5db91e9c

+4 -2

4 changed files

expand all

drivers

acpi

internal.h

power.c

scan.c

sleep.h

drivers/acpi/internal.h

··· 139 139 int acpi_power_get_inferred_state(struct acpi_device *device, int *state); 140 140 int acpi_power_on_resources(struct acpi_device *device, int state); 141 141 int acpi_power_transition(struct acpi_device *device, int state); 142 + void acpi_turn_off_unused_power_resources(void); 142 143 143 144 /* -------------------------------------------------------------------------- 144 145 Device Power Management

+1 -1

drivers/acpi/power.c

··· 996 996 997 997 mutex_unlock(&power_resource_list_lock); 998 998 } 999 + #endif 999 1000 1000 1001 void acpi_turn_off_unused_power_resources(void) 1001 1002 { ··· 1017 1016 1018 1017 mutex_unlock(&power_resource_list_lock); 1019 1018 } 1020 - #endif

drivers/acpi/scan.c

··· 2360 2360 } 2361 2361 } 2362 2362 2363 + acpi_turn_off_unused_power_resources(); 2364 + 2363 2365 acpi_scan_initialized = true; 2364 2366 2365 2367 out:

-1

drivers/acpi/sleep.h

··· 8 8 extern struct mutex acpi_device_lock; 9 9 10 10 extern void acpi_resume_power_resources(void); 11 - extern void acpi_turn_off_unused_power_resources(void); 12 11 13 12 static inline acpi_status acpi_set_waking_vector(u32 wakeup_address) 14 13 {