]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/nouveau/gsp: simplify code with acpi_get_local_u64_address()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 20 Jan 2026 15:20:49 +0000 (16:20 +0100)
committerDanilo Krummrich <dakr@kernel.org>
Sun, 8 Feb 2026 14:37:14 +0000 (15:37 +0100)
Now we have a helper so there's no need to open-code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20260120152049.1763055-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c

index 2a7e80c6d70f391bccfcb7a58276dd95e1b2857e..c675324693af252448b8c3ffb3f5b6e8d36417bf 100644 (file)
@@ -796,7 +796,8 @@ r535_gsp_acpi_mux_id(acpi_handle handle, u32 id, MUX_METHOD_DATA_ELEMENT *mode,
        struct acpi_object_list input = { 1, &mux_arg };
        acpi_handle iter = NULL, handle_mux = NULL;
        acpi_status status;
-       unsigned long long value;
+       u64 value;
+       int ret;
 
        mode->status = 0xffff;
        part->status = 0xffff;
@@ -806,8 +807,8 @@ r535_gsp_acpi_mux_id(acpi_handle handle, u32 id, MUX_METHOD_DATA_ELEMENT *mode,
                if (ACPI_FAILURE(status) || !iter)
                        return;
 
-               status = acpi_evaluate_integer(iter, "_ADR", NULL, &value);
-               if (ACPI_FAILURE(status) || value != id)
+               ret = acpi_get_local_u64_address(iter, &value);
+               if (ret || value != id)
                        continue;
 
                handle_mux = iter;