Commit abd51738 authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher

drm/amdgpu: Fix minmax warning

Fix minmax warning by using min_t() macro and explicitly specifying
the assignment type.

Cc: Alex Deucher <Alexander.Deucher@amd.com>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarAlex Deucher <Alexander.Deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0317d739
...@@ -1436,7 +1436,9 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, ...@@ -1436,7 +1436,9 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
case 0x8: case 0x8:
high = smu->thermal_range.software_shutdown_temp + high = smu->thermal_range.software_shutdown_temp +
smu->thermal_range.software_shutdown_temp_offset; smu->thermal_range.software_shutdown_temp_offset;
high = min(SMU_THERMAL_MAXIMUM_ALERT_TEMP, high); high = min_t(typeof(high),
SMU_THERMAL_MAXIMUM_ALERT_TEMP,
high);
dev_emerg(adev->dev, "Reduce soft CTF limit to %d (by an offset %d)\n", dev_emerg(adev->dev, "Reduce soft CTF limit to %d (by an offset %d)\n",
high, high,
smu->thermal_range.software_shutdown_temp_offset); smu->thermal_range.software_shutdown_temp_offset);
...@@ -1449,8 +1451,9 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, ...@@ -1449,8 +1451,9 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
WREG32_SOC15(THM, 0, regTHM_THERMAL_INT_CTRL, data); WREG32_SOC15(THM, 0, regTHM_THERMAL_INT_CTRL, data);
break; break;
case 0x9: case 0x9:
high = min(SMU_THERMAL_MAXIMUM_ALERT_TEMP, high = min_t(typeof(high),
smu->thermal_range.software_shutdown_temp); SMU_THERMAL_MAXIMUM_ALERT_TEMP,
smu->thermal_range.software_shutdown_temp);
dev_emerg(adev->dev, "Recover soft CTF limit to %d\n", high); dev_emerg(adev->dev, "Recover soft CTF limit to %d\n", high);
data = RREG32_SOC15(THM, 0, regTHM_THERMAL_INT_CTRL); data = RREG32_SOC15(THM, 0, regTHM_THERMAL_INT_CTRL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment