ACPI: scan: Add acpi_info_matches_hids() helper

acpi_device_dep_initialize() disergards _DEP "suppliers" with a _HID
of "INT3396" and checks this using an acpi_device_info struct.

Because in general there are other device IDs that need to be treated
in the same way, add acpi_info_matches_hids() which checks a list of
_HIDs for this purpose and switch acpi_device_dep_initialize() over
to using it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
[ rjw: Changelog rewrite ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Hans de Goede 2020-11-21 21:30:34 +01:00 committed by Rafael J. Wysocki
parent c1e9735975
commit 637b9f1a11

View file

@ -719,6 +719,28 @@ int acpi_device_add(struct acpi_device *device,
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Device Enumeration Device Enumeration
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
static bool acpi_info_matches_hids(struct acpi_device_info *info,
const char * const hids[])
{
int i;
if (!(info->valid & ACPI_VALID_HID))
return false;
for (i = 0; hids[i]; i++) {
if (!strcmp(info->hardware_id.string, hids[i]))
return true;
}
return false;
}
/* List of HIDs for which we ignore matching ACPI devices, when checking _DEP lists. */
static const char * const acpi_ignore_dep_hids[] = {
"INT3396", /* Windows System Power Management Controller */
NULL
};
static struct acpi_device *acpi_bus_get_parent(acpi_handle handle) static struct acpi_device *acpi_bus_get_parent(acpi_handle handle)
{ {
struct acpi_device *device = NULL; struct acpi_device *device = NULL;
@ -1833,13 +1855,7 @@ static void acpi_device_dep_initialize(struct acpi_device *adev)
continue; continue;
} }
/* skip = acpi_info_matches_hids(info, acpi_ignore_dep_hids);
* Skip the dependency of Windows System Power
* Management Controller
*/
skip = info->valid & ACPI_VALID_HID &&
!strcmp(info->hardware_id.string, "INT3396");
kfree(info); kfree(info);
if (skip) if (skip)