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

Alex Deucher alexdeucher at gmail.com
Mon Aug 12 16:10:42 UTC 2019


Applied.  thanks!

Alex

On Mon, Aug 5, 2019 at 6:29 AM Colin King <colin.king at canonical.com> wrote:
>
> From: Colin Ian King <colin.king at canonical.com>
>
> 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 at canonical.com>
> ---
>  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
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel


More information about the dri-devel mailing list