RE: [PATCH][drm-next] drm/amd/powerplay: remove redundant duplicated return check

From: Quan, Evan
Date: Tue Aug 06 2019 - 22:57:07 EST


Thanks! Reviewed-by: Evan Quan <evan.quan@xxxxxxx>

> -----Original Message-----
> From: Colin King <colin.king@xxxxxxxxxxxxx>
> Sent: Monday, August 05, 2019 6:30 PM
> To: Rex Zhu <rex.zhu@xxxxxxx>; Quan, Evan <Evan.Quan@xxxxxxx>;
> Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Koenig, Christian
> <Christian.Koenig@xxxxxxx>; Zhou, David(ChunMing)
> <David1.Zhou@xxxxxxx>; David Airlie <airlied@xxxxxxxx>; Daniel Vetter
> <daniel@xxxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx; dri-
> devel@xxxxxxxxxxxxxxxxxxxxx
> Cc: kernel-janitors@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Subject: [PATCH][drm-next] drm/amd/powerplay: remove redundant
> duplicated return check
>
> From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
>
> The check on ret is duplicated in two places, it is redundant code.
> Remove it.
>
> Addresses-Coverity: ("Logically dead code")
> Fixes: b94afb61cdae ("drm/amd/powerplay: honor hw limit on fetching
> metrics data for navi10")
> Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
> b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
> index d62c2784b102..b272c8dc8f79 100644
> --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
> +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
> @@ -941,8 +941,6 @@ static int navi10_get_gpu_power(struct smu_context
> *smu, uint32_t *value)
> ret = navi10_get_metrics_table(smu, &metrics);
> if (ret)
> return ret;
> - if (ret)
> - return ret;
>
> *value = metrics.AverageSocketPower << 8;
>
> @@ -1001,8 +999,6 @@ static int navi10_get_fan_speed_rpm(struct
> smu_context *smu,
> ret = navi10_get_metrics_table(smu, &metrics);
> if (ret)
> return ret;
> - if (ret)
> - return ret;
>
> *speed = metrics.CurrFanSpeed;
>
> --
> 2.20.1