summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2026-01-20 18:20:49 +0300
committerDanilo Krummrich <dakr@kernel.org>2026-02-08 17:37:14 +0300
commit9d757669b2b22cd224c334924f798393ffca537c (patch)
tree522225b332c01345c4ab3e87e4849e08c7796f6e
parentdbce431756f85ec76a189312afdae2dee14fb0de (diff)
downloadlinux-9d757669b2b22cd224c334924f798393ffca537c.tar.xz
drm/nouveau/gsp: simplify code with acpi_get_local_u64_address()
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>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
index 2a7e80c6d70f..c675324693af 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
@@ -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;