ACPI: use device name LNXSYBUS.xx for ACPI \_SB and \_TZ objects
Use device name "LNXSYBUS:xx" instead of "device.xx" for ACPI objects \_SB and \_TZ. BTW, the original check of "handle == ACPI_ROOT_OBJECT" in statment "else if (list_empty(&pnp->ids) && handle == ACPI_ROOT_OBJECT)" is always false because of the code at the begin of that block. if (handle == ACPI_ROOT_OBJECT) { acpi_add_id(pnp, ACPI_SYSTEM_HID); break; } Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
4a6172a4e9
commit
ae3caa80a5
|
@ -1706,6 +1706,20 @@ static bool acpi_ibm_smbus_match(acpi_handle handle)
|
|||
return false;
|
||||
}
|
||||
|
||||
static bool acpi_object_is_system_bus(acpi_handle handle)
|
||||
{
|
||||
acpi_handle tmp;
|
||||
|
||||
if (ACPI_SUCCESS(acpi_get_handle(NULL, "\\_SB", &tmp)) &&
|
||||
tmp == handle)
|
||||
return true;
|
||||
if (ACPI_SUCCESS(acpi_get_handle(NULL, "\\_TZ", &tmp)) &&
|
||||
tmp == handle)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp,
|
||||
int device_type)
|
||||
{
|
||||
|
@ -1757,8 +1771,10 @@ static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp,
|
|||
acpi_add_id(pnp, ACPI_DOCK_HID);
|
||||
else if (acpi_ibm_smbus_match(handle))
|
||||
acpi_add_id(pnp, ACPI_SMBUS_IBM_HID);
|
||||
else if (list_empty(&pnp->ids) && handle == ACPI_ROOT_OBJECT) {
|
||||
acpi_add_id(pnp, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
|
||||
else if (list_empty(&pnp->ids) &&
|
||||
acpi_object_is_system_bus(handle)) {
|
||||
/* \_SB, \_TZ, LNXSYBUS */
|
||||
acpi_add_id(pnp, ACPI_BUS_HID);
|
||||
strcpy(pnp->device_name, ACPI_BUS_DEVICE_NAME);
|
||||
strcpy(pnp->device_class, ACPI_BUS_CLASS);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue