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

Commit 594df89a authored by Tang Chen's avatar Tang Chen Committed by Rafael J. Wysocki
Browse files

ACPI: Fix a hard coding style when determining if a device is a container, v3 



"ACPI0004","PNP0A05" and "PNP0A06" are all defined in array
container_device_ids[], so use it, but not the hard coding style.

Also, introduce a new API is_container_device() to determine if a
device is a container device.

Signed-off-by: default avatarTang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Reviewed-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0a290ac4

drivers/acpi/container.c

+14 −3
Original line number Diff line number Diff line
@@ -92,6 +92,19 @@ static int is_device_present(acpi_handle handle) 
	return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);

}



static bool is_container_device(const char *hid)

{

	const struct acpi_device_id *container_id;



	for (container_id = container_device_ids;

	     container_id->id[0]; container_id++) {

		if (!strcmp((char *)container_id->id, hid))

			return true;

	}



	return false;

}



/*******************************************************************/

static int acpi_container_add(struct acpi_device *device)

{
@@ -232,10 +245,8 @@ container_walk_namespace_cb(acpi_handle handle, 
		goto end;

	}



	if (strcmp(hid, "ACPI0004") && strcmp(hid, "PNP0A05") &&

	    strcmp(hid, "PNP0A06")) {

	if (!is_container_device(hid))

		goto end;

	}



	switch (*action) {

	case INSTALL_NOTIFY_HANDLER: