mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 07:04:24 +00:00
Code Issues Releases Wiki Activity

ACPI: scan: Simplify initialization of power and sleep buttons

Browse source 
It should be perfectly fine to use ACPI if the "fixed" power or sleep
buttons cannot be initialized.  Moreover, running acpi_bus_scan()
successfully on ACPI_ROOT_OBJECT generally causes many devices to
be enumerated and probed, possibly including the entire PCI bus, so
unregistering acpi_root if the registration of the "fixed" buttons
fails is rather unhelpful.

For this reason, do not fail acpi_scan_init() when
acpi_bus_scan_fixed() fails and turn the latter into a void function.

While at it, drop the outdated and misleading comment from
acpi_bus_scan_fixed().

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Rafael J. Wysocki 2022-01-11 17:52:00 +01:00
parent b6c55b162b
commit 681e7187ae
1 changed files with 21 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
drivers/acpi/scan.c
View file

@ -2486,42 +2486,33 @@ int acpi_bus_register_early_device(int type)
} }
EXPORT_SYMBOL_GPL(acpi_bus_register_early_device); EXPORT_SYMBOL_GPL(acpi_bus_register_early_device);
static int acpi_bus_scan_fixed(void) static void acpi_bus_scan_fixed(void)
{ {
int result = 0;
/*
* Enumerate all fixed-feature devices.
*/
if (!(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) { if (!(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) {
struct acpi_device *device = NULL; struct acpi_device *adev = NULL;
result = acpi_add_single_object(&device, NULL, acpi_add_single_object(&adev, NULL, ACPI_BUS_TYPE_POWER_BUTTON,
ACPI_BUS_TYPE_POWER_BUTTON, false); false);
if (result) if (adev) {
return result; adev->flags.match_driver = true;
if (device_attach(&adev->dev) >= 0)
device->flags.match_driver = true; device_init_wakeup(&adev->dev, true);
result = device_attach(&device->dev); else
if (result < 0) dev_dbg(&adev->dev, "No driver\n");
return result; }
device_init_wakeup(&device->dev, true);
} }
if (!(acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON)) { if (!(acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON)) {
struct acpi_device *device = NULL; struct acpi_device *adev = NULL;
result = acpi_add_single_object(&device, NULL, acpi_add_single_object(&adev, NULL, ACPI_BUS_TYPE_SLEEP_BUTTON,
ACPI_BUS_TYPE_SLEEP_BUTTON, false); false);
if (result) if (adev) {
return result; adev->flags.match_driver = true;
if (device_attach(&adev->dev) < 0)
device->flags.match_driver = true; dev_dbg(&adev->dev, "No driver\n");
result = device_attach(&device->dev); }
} }
return result < 0 ? result : 0;
} }
static void __init acpi_get_spcr_uart_addr(void) static void __init acpi_get_spcr_uart_addr(void)
@ -2601,15 +2592,8 @@ void __init acpi_scan_init(void)
goto out; goto out;
/* Fixed feature devices do not exist on HW-reduced platform */ /* Fixed feature devices do not exist on HW-reduced platform */
if (!acpi_gbl_reduced_hardware) { if (!acpi_gbl_reduced_hardware)
if (acpi_bus_scan_fixed()) { acpi_bus_scan_fixed();
acpi_detach_data(acpi_root->handle,
acpi_scan_drop_device);
acpi_device_del(acpi_root);
acpi_bus_put_acpi_device(acpi_root);
goto out;
}
}
acpi_turn_off_unused_power_resources(); acpi_turn_off_unused_power_resources();