Re: [PATCH V2] amdgpu: remove unnecessary condition check

[Christian König]

Am 21.04.20 um 04:41 schrieb Bernard Zhao:

There is no need to if check again, maybe we could merge
into the above else branch.

Signed-off-by: Bernard Zhao <bern...@vivo.com>

---
Changes since V1:
*commit message improve
*code style refactoring

Link for V1:
* 
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fpatchwork%2Fpatch%2F1226587%2F&amp;data=02%7C01%7Cchristian.koenig%40amd.com%7C50bb3a13f28b4e5d787508d7e59d9903%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637230337359422169&amp;sdata=LXUJgHOxfwSpacdW6suiI00z8egbRC3z3za0H3XtNV4%3D&amp;reserved=0
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 +++++++++-------
  1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 9dff792c9290..a64eeb07bec4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -660,13 +660,15 @@ static int reserve_bo_and_vm(struct kgd_mem *mem,

ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list,

                                     false, &ctx->duplicates);
-       if (!ret)
-               ctx->reserved = true;
-       else {
+
+       if (ret) {
                pr_err("Failed to reserve buffers in ttm\n");
                kfree(ctx->vm_pd);
                ctx->vm_pd = NULL;
        }
+       else {
+               ctx->reserved = true;
+       }

return ret;

  }
@@ -733,15 +735,15 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem,

ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list,

                                     false, &ctx->duplicates);
-       if (!ret)
-               ctx->reserved = true;
-       else
-               pr_err("Failed to reserve buffers in ttm.\n");

if (ret) {

+               pr_err("Failed to reserve buffers in ttm.\n");
                kfree(ctx->vm_pd);
                ctx->vm_pd = NULL;
        }
+       else {

Please use "} else {" here.

Christian.

+               ctx->reserved = true;
+       }

return ret;

  }

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx