Commit ddfebb75 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: scan: Reduce code duplication related to fixed event devices 



Move duplicate fixed event device registration code
from acpi_bus_scan_fixed() into a new function called
acpi_bus_add_fixed_device_object() and make acpi_bus_scan_fixed()
invoke that function as needed.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/1916860.atdPhlSkOF@rafael.j.wysocki
parent ab06eb92

drivers/acpi/scan.c

+17 −25
Original line number Diff line number Diff line
@@ -2759,13 +2759,11 @@ int acpi_bus_register_early_device(int type) 
}

EXPORT_SYMBOL_GPL(acpi_bus_register_early_device);



static void acpi_bus_scan_fixed(void)

static void acpi_bus_add_fixed_device_object(enum acpi_bus_device_type type)

{

	if (!(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) {

	struct acpi_device *adev = NULL;



		acpi_add_single_object(&adev, NULL, ACPI_BUS_TYPE_POWER_BUTTON,

				       false);

	acpi_add_single_object(&adev, NULL, type, false);

	if (adev) {

		adev->flags.match_driver = true;

		if (device_attach(&adev->dev) >= 0)
@@ -2777,19 +2775,13 @@ static void acpi_bus_scan_fixed(void) 
	}

}



	if (!(acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON)) {

		struct acpi_device *adev = NULL;



		acpi_add_single_object(&adev, NULL, ACPI_BUS_TYPE_SLEEP_BUTTON,

				       false);

		if (adev) {

			adev->flags.match_driver = true;

			if (device_attach(&adev->dev) < 0)

				dev_dbg(&adev->dev, "No driver\n");

static void acpi_bus_scan_fixed(void)

{

	if (!(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON))

		acpi_bus_add_fixed_device_object(ACPI_BUS_TYPE_POWER_BUTTON);



			acpi_default_enumeration(adev);

		}

	}

	if (!(acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON))

		acpi_bus_add_fixed_device_object(ACPI_BUS_TYPE_SLEEP_BUTTON);

}



static void __init acpi_get_spcr_uart_addr(void)