Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ACPI / scan: Make scanning of fixed devices follow the general scheme 



Make acpi_bus_scan_fixed() use device_attach() directly to attach
drivers, if any, to the fixed devices in analogy with how
acpi_bus_scan() works, which allows the last argument of
acpi_add_single_object() to be dropped and the manipulation of the
flags.match_driver bit to be moved to acpi_init_device_object()
and acpi_device_add_finalize().

After these changes all of the functions for the initialization
and registration of struct acpi_device objects work in the same
way for all of them.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
parent 8a78cf70

drivers/acpi/scan.c

+24 −11
Original line number Diff line number Diff line
@@ -1441,19 +1441,21 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle, 
	acpi_device_get_busid(device);

	acpi_device_set_id(device);

	acpi_bus_get_flags(device);

	device->flags.match_driver = false;

	device_initialize(&device->dev);

	dev_set_uevent_suppress(&device->dev, true);

}



void acpi_device_add_finalize(struct acpi_device *device)

{

	device->flags.match_driver = true;

	dev_set_uevent_suppress(&device->dev, false);

	kobject_uevent(&device->dev.kobj, KOBJ_ADD);

}



static int acpi_add_single_object(struct acpi_device **child,

				  acpi_handle handle, int type,

				  unsigned long long sta, bool match_driver)

				  unsigned long long sta)

{

	int result;

	struct acpi_device *device;
@@ -1469,7 +1471,6 @@ static int acpi_add_single_object(struct acpi_device **child, 
	acpi_bus_get_power_flags(device);

	acpi_bus_get_wakeup_device_flags(device);



	device->flags.match_driver = match_driver;

	result = acpi_device_add(device, acpi_device_release);

	if (result) {

		acpi_device_release(&device->dev);
@@ -1562,12 +1563,10 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used, 
		return AE_CTRL_DEPTH;

	}



	acpi_add_single_object(&device, handle, type, sta, false);

	acpi_add_single_object(&device, handle, type, sta);

	if (!device)

		return AE_CTRL_DEPTH;



	device->flags.match_driver = true;



 out:

	if (!*return_value)

		*return_value = device;
@@ -1679,25 +1678,39 @@ EXPORT_SYMBOL_GPL(acpi_bus_trim); 
static int acpi_bus_scan_fixed(void)

{

	int result = 0;

	struct acpi_device *device = NULL;



	/*

	 * Enumerate all fixed-feature devices.

	 */

	if ((acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON) == 0) {

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

		struct acpi_device *device = NULL;



		result = acpi_add_single_object(&device, NULL,

						ACPI_BUS_TYPE_POWER_BUTTON,

						ACPI_STA_DEFAULT, true);

						ACPI_STA_DEFAULT);

		if (result)

			return result;



		result = device_attach(&device->dev);

		if (result < 0)

			return result;



		device_init_wakeup(&device->dev, true);

	}



	if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) {

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

		struct acpi_device *device = NULL;



		result = acpi_add_single_object(&device, NULL,

						ACPI_BUS_TYPE_SLEEP_BUTTON,

						ACPI_STA_DEFAULT, true);

						ACPI_STA_DEFAULT);

		if (result)

			return result;



		result = device_attach(&device->dev);

	}



	return result;

	return result < 0 ? result : 0;

}



int __init acpi_scan_init(void)