Skip to contentSkip to conversation

drm/amdgpu: cleanup coding style in amdkfd a bit

PATCH In review Bernard Zhao 2 participants 2 messages Apr 22, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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
index 9dff792c9290..acb612c53b9c 100644
@@ -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
maintainer Reviewed-by on v5 1/1
#1 lore raw
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]>.

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 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://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fpatchwork%2Fpatch%2F1226587%2F&amp;data=02%7C01%7CFelix.Kuehling%40amd.com%7C27509aa0455042beedc708d7e65efc22%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637231167951862118&amp;sdata=JPCxsDycw0JvZfym1akV7d%2B4oPzvzQ04Zl1rv3WN%2Fj0%3D&amp;reserved=0

---
  .../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
index 9dff792c9290..acb612c53b9c 100644
@@ -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 -1
  		ctx->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