drm/amdgpu: cleanup coding style in amdkfd a bit
Subsystems (3)
PATCH v5 1/1 drm/amdgpu: cleanup coding style in amdkfd a bit
Make the code a bit more readable by using a common error handling pattern.
With that done the patch is Reviewed-by: Christian König <[email protected]>.
Changes since V1:
*commit message improve
*code style refactoring
Changes since V2:
*code style adjust
Changes since V3:
*find the best way to merge unnecessary if/else check branch
Changes since V4:
*Improve the subject line and commit message
Link for V1:
*https://lore.kernel.org/patchwork/patch/1226587/
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +9 -11
@@ -660,15 +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 { -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 ; +return ret; } -return ret; + ctx->reserved = true; +return 0 ; }/**
@@ -733,17 +733,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 ; +return ret; } -return ret; + ctx->reserved = true; +return 0 ; }/**
Signature · 1 line
2.26.2
Quoted 6 lines · Bernard Zhao
Make the code a bit more readable by using a common error handling pattern.
With that done the patch is Reviewed-by: Christian König <[email protected]>.Signed-off-by Bernard Zhao <[email protected]>
Thanks. The patch is
I removed the history from the commit message, made Christian's Reviewed-by official and applied the patch.
Regards,
Felix
Quoted 57 lines
Changes since V1:
*commit message improve
*code style refactoringChanges since V2:
*code style adjustChanges since V3:
*find the best way to merge unnecessary if/else check branchChanges since V4:
*Improve the subject line and commit message--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +6
-10@@ -660,15 +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 { -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 ; +return ret; } -return ret; + ctx->reserved = true; +return 0 ; }/** @@ -733,17 +733,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);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c static int reserve_bo_and_cond_vms(struct kgd_mem *mem, · line 747
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +3
-1ctx->vm_pd =NULL ; +return ret; } -return ret; + ctx->reserved = true; +return 0 ; }/**
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel