[PATCH 1/4] drm/i915/gem: Remove goto label that are only used once

Liao Yuanhong posted 4 patches 2 months ago
[PATCH 1/4] drm/i915/gem: Remove goto label that are only used once
Posted by Liao Yuanhong 2 months ago
Remove unnecessary goto labels to improve code readability. 

Signed-off-by: Liao Yuanhong <liaoyuanhong@vivo.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_region.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
index 636768d0f57e..539d1716d454 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
@@ -92,15 +92,13 @@ __i915_gem_object_create_region(struct intel_memory_region *mem,
 		flags |= I915_BO_ALLOC_PM_EARLY;
 
 	err = mem->ops->init_object(mem, obj, offset, size, page_size, flags);
-	if (err)
-		goto err_object_free;
+	if (err) {
+		i915_gem_object_free(obj);
+		return ERR_PTR(err);
+	}
 
 	trace_i915_gem_object_create(obj);
 	return obj;
-
-err_object_free:
-	i915_gem_object_free(obj);
-	return ERR_PTR(err);
 }
 
 struct drm_i915_gem_object *
-- 
2.34.1
Re: [PATCH 1/4] drm/i915/gem: Remove goto label that are only used once
Posted by Jani Nikula 2 months ago
On Tue, 05 Aug 2025, Liao Yuanhong <liaoyuanhong@vivo.com> wrote:
> Remove unnecessary goto labels to improve code readability. 

Please don't. It's fine as it is.

> Signed-off-by: Liao Yuanhong <liaoyuanhong@vivo.com>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_region.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
> index 636768d0f57e..539d1716d454 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
> @@ -92,15 +92,13 @@ __i915_gem_object_create_region(struct intel_memory_region *mem,
>  		flags |= I915_BO_ALLOC_PM_EARLY;
>  
>  	err = mem->ops->init_object(mem, obj, offset, size, page_size, flags);
> -	if (err)
> -		goto err_object_free;
> +	if (err) {
> +		i915_gem_object_free(obj);
> +		return ERR_PTR(err);
> +	}
>  
>  	trace_i915_gem_object_create(obj);
>  	return obj;
> -
> -err_object_free:
> -	i915_gem_object_free(obj);
> -	return ERR_PTR(err);
>  }
>  
>  struct drm_i915_gem_object *

-- 
Jani Nikula, Intel