From: Andy Shevchenko Date: Mon, 2 Oct 2023 13:52:18 +0000 (+0300) Subject: ACPI: x86: s2idle: Switch to use acpi_evaluate_dsm_typed() X-Git-Tag: v6.7-rc1~158^2~2^4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=553921875ff7bcd5f33eb08afb67fba4e864f646;p=thirdparty%2Fkernel%2Flinux.git ACPI: x86: s2idle: Switch to use acpi_evaluate_dsm_typed() The acpi_evaluate_dsm_typed() provides a way to check the type of the object evaluated by _DSM call. Use it instead of open coded variant. Signed-off-by: Andy Shevchenko Reviewed-by: Mario Limonciello Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index 08f7c67082063..7d64e655f1b86 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -417,11 +417,10 @@ static int validate_dsm(acpi_handle handle, const char *uuid, int rev, guid_t *d int ret = -EINVAL; guid_parse(uuid, dsm_guid); - obj = acpi_evaluate_dsm(handle, dsm_guid, rev, 0, NULL); /* Check if the _DSM is present and as expected. */ - if (!obj || obj->type != ACPI_TYPE_BUFFER || obj->buffer.length == 0 || - obj->buffer.length > sizeof(u32)) { + obj = acpi_evaluate_dsm_typed(handle, dsm_guid, rev, 0, NULL, ACPI_TYPE_BUFFER); + if (!obj || obj->buffer.length == 0 || obj->buffer.length > sizeof(u32)) { acpi_handle_debug(handle, "_DSM UUID %s rev %d function 0 evaluation failed\n", uuid, rev); goto out;