Re: [Patch v1 3/4] drm/amdgpu/userq: no need to use local variable here for return

["Christian König" <christian.koenig@amd.com>]

On 3/26/26 09:56, Sunil Khatri wrote:
> In function amdgpu_userq_gem_va_unmap_validate use function
> return value directly in the if condition instead
> of local variable ret.
> 
> Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> index 2b07c3941927..48cb2e21ce56 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> @@ -1478,7 +1478,6 @@ int amdgpu_userq_gem_va_unmap_validate(struct amdgpu_device *adev,
>  	u32 ip_mask = amdgpu_userq_get_supported_ip_mask(adev);
>  	struct amdgpu_bo_va *bo_va = mapping->bo_va;
>  	struct dma_resv *resv = bo_va->base.bo->tbo.base.resv;
> -	int ret = 0;
>  
>  	if (!ip_mask)
>  		return 0;
> @@ -1493,9 +1492,8 @@ int amdgpu_userq_gem_va_unmap_validate(struct amdgpu_device *adev,
>  	 * the eviction fence is always unsignaled.
>  	 */
>  	if (!dma_resv_test_signaled(resv, DMA_RESV_USAGE_BOOKKEEP)) {

That test is just nonsense, call dma_resv_wait_timeout() directly here.

> -		ret = dma_resv_wait_timeout(resv, DMA_RESV_USAGE_BOOKKEEP, true,
> -					    MAX_SCHEDULE_TIMEOUT);
> -		if (ret <= 0)
> +		if (dma_resv_wait_timeout(resv, DMA_RESV_USAGE_BOOKKEEP, true,
> +					    MAX_SCHEDULE_TIMEOUT) <= 0)
>  			return -EBUSY;

That is wrong as well. We need to return ret here and not -EBUSY!

Regards,
Christian.

>  	}
>