Commit 8b94d051 authored Aug 05, 2019 by Colin Ian King Committed by Alex Deucher Aug 12, 2019

drm/amd/powerplay: remove redundant duplicated return check



The check on ret is duplicated in two places, it is redundant code.
Remove it.

Addresses-Coverity: ("Logically dead code")
Fixes: b94afb61 ("drm/amd/powerplay: honor hw limit on fetching metrics data for navi10")
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 54a9bcb0

drivers/gpu/drm/amd/powerplay/navi10_ppt.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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;