Now we have a helper so there's no need to open-code.

Signed-off-by: Andy Shevchenko <[email protected]>
---
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c | 7 ++++---
 1 file 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;
-- 
2.50.1

Reply via email to