mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'acpi-bus'
* acpi-bus: ACPI / bus: Adjust ACPI subsystem initialization for new table loading mode ACPI / bus: Make acpi_get_first_physical_node() public
This commit is contained in:
commit
4ec9e2890a
3 changed files with 11 additions and 3 deletions
|
|
@ -985,7 +985,8 @@ void __init acpi_early_init(void)
|
|||
goto error0;
|
||||
}
|
||||
|
||||
if (acpi_gbl_group_module_level_code) {
|
||||
if (!acpi_gbl_parse_table_as_term_list &&
|
||||
acpi_gbl_group_module_level_code) {
|
||||
status = acpi_load_tables();
|
||||
if (ACPI_FAILURE(status)) {
|
||||
printk(KERN_ERR PREFIX
|
||||
|
|
@ -1074,7 +1075,8 @@ static int __init acpi_bus_init(void)
|
|||
status = acpi_ec_ecdt_probe();
|
||||
/* Ignore result. Not having an ECDT is not fatal. */
|
||||
|
||||
if (!acpi_gbl_group_module_level_code) {
|
||||
if (acpi_gbl_parse_table_as_term_list ||
|
||||
!acpi_gbl_group_module_level_code) {
|
||||
status = acpi_load_tables();
|
||||
if (ACPI_FAILURE(status)) {
|
||||
printk(KERN_ERR PREFIX
|
||||
|
|
|
|||
|
|
@ -116,7 +116,6 @@ bool acpi_device_is_present(struct acpi_device *adev);
|
|||
bool acpi_device_is_battery(struct acpi_device *adev);
|
||||
bool acpi_device_is_first_physical_node(struct acpi_device *adev,
|
||||
const struct device *dev);
|
||||
struct device *acpi_get_first_physical_node(struct acpi_device *adev);
|
||||
|
||||
/* --------------------------------------------------------------------------
|
||||
Device Matching and Notification
|
||||
|
|
|
|||
Loading…
Reference in a new issue