[PATCH] drm/amdgpu/jpeg: remove redundant check when it returns

Nirmoy nirmodas at amd.com
Fri Aug 14 15:25:18 UTC 2020


Acked-by: Nirmoy Das <nirmoy.das at amd.com>

On 8/14/20 5:14 PM, Leo Liu wrote:
> Fix warning from kernel test robot
> v2: remove the local variable as well
>
> Signed-off-by: Leo Liu <leo.liu at amd.com>
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
> index c41e5590a701..3a0dff53654d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
> @@ -460,15 +460,10 @@ static bool jpeg_v3_0_is_idle(void *handle)
>   static int jpeg_v3_0_wait_for_idle(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> -	int ret;
>   
> -	ret = SOC15_WAIT_ON_RREG(JPEG, 0, mmUVD_JRBC_STATUS,
> +	return SOC15_WAIT_ON_RREG(JPEG, 0, mmUVD_JRBC_STATUS,
>   		UVD_JRBC_STATUS__RB_JOB_DONE_MASK,
>   		UVD_JRBC_STATUS__RB_JOB_DONE_MASK);
> -	if (ret)
> -		return ret;
> -
> -	return ret;
>   }
>   
>   static int jpeg_v3_0_set_clockgating_state(void *handle,


More information about the amd-gfx mailing list