Re: [PATCH 18/20] drm/drm_gpuva_mgr: Remove set but unused variable 'prev'

[Danilo Krummrich]

Hi Lee,

On 8/24/23 09:37, Lee Jones wrote:
> Fixes the following W=1 kernel build warning(s):
>
>   drivers/gpu/drm/drm_gpuva_mgr.c: In function ‘__drm_gpuva_sm_map’:
>   drivers/gpu/drm/drm_gpuva_mgr.c:1079:39: warning: variable ‘prev’ set but not used [-Wunused-but-set-variable]

Thanks for fixing this up.

However, I already had a patch in the queue addressing the warning,
which I already applied to drm-misc/drm-misc-next-fixes.

- Danilo

> Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
> ---
> Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> Cc: Maxime Ripard <mripard@xxxxxxxxxx>
> Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
> Cc: David Airlie <airlied@xxxxxxxxx>
> Cc: Daniel Vetter <daniel@xxxxxxxx>
> Cc: Sumit Semwal <sumit.semwal@xxxxxxxxxx>
> Cc: "Christian König" <christian.koenig@xxxxxxx>
> Cc: Danilo Krummrich <dakr@xxxxxxxxxx>
> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> Cc: linux-media@xxxxxxxxxxxxxxx
> Cc: linaro-mm-sig@xxxxxxxxxxxxxxxx
> ---
>   drivers/gpu/drm/drm_gpuva_mgr.c | 10 ++++------
>   1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gpuva_mgr.c b/drivers/gpu/drm/drm_gpuva_mgr.c
> index f86bfad74ff8a..ad99c9cfedac7 100644
> --- a/drivers/gpu/drm/drm_gpuva_mgr.c
> +++ b/drivers/gpu/drm/drm_gpuva_mgr.c
> @@ -1076,7 +1076,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
>   		   u64 req_addr, u64 req_range,
>   		   struct drm_gem_object *req_obj, u64 req_offset)
>   {
> -	struct drm_gpuva *va, *next, *prev = NULL;
> +	struct drm_gpuva *va, *next;
>   	u64 req_end = req_addr + req_range;
>   	int ret;
>   
> @@ -1106,7 +1106,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
>   				ret = op_unmap_cb(ops, priv, va, merge);
>   				if (ret)
>   					return ret;
> -				goto next;
> +				continue;
>   			}
>   
>   			if (end > req_end) {
> @@ -1151,7 +1151,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
>   				ret = op_remap_cb(ops, priv, &p, NULL, &u);
>   				if (ret)
>   					return ret;
> -				goto next;
> +				continue;
>   			}
>   
>   			if (end > req_end) {
> @@ -1184,7 +1184,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
>   				ret = op_unmap_cb(ops, priv, va, merge);
>   				if (ret)
>   					return ret;
> -				goto next;
> +				continue;
>   			}
>   
>   			if (end > req_end) {
> @@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
>   				break;
>   			}
>   		}
> -next:
> -		prev = va;
>   	}
>   
>   	return op_map_cb(ops, priv,