summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuben Tuikov <luben.tuikov@amd.com>2022-11-21 12:18:36 -0500
committerAlex Deucher <alexander.deucher@amd.com>2022-11-23 10:31:30 -0500
commitabd51738fe754a684ec44b7a9eca1981e1704ad9 (patch)
treee499c207d72a8755a8e98b1f1a91033d27fdcb0f
parent0317d73954850c48268f3db00a49e676d12b10cf (diff)
downloadlinux-abd51738fe754a684ec44b7a9eca1981e1704ad9.tar.bz2
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: Luben Tuikov <luben.tuikov@amd.com> Reviewed-by: Alex Deucher <Alexander.Deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 5a905002252d..53abd7709242 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -1436,7 +1436,9 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
case 0x8:
high = smu->thermal_range.software_shutdown_temp +
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",
high,
smu->thermal_range.software_shutdown_temp_offset);
@@ -1449,8 +1451,9 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
WREG32_SOC15(THM, 0, regTHM_THERMAL_INT_CTRL, data);
break;
case 0x9:
- high = min(SMU_THERMAL_MAXIMUM_ALERT_TEMP,
- smu->thermal_range.software_shutdown_temp);
+ high = min_t(typeof(high),
+ SMU_THERMAL_MAXIMUM_ALERT_TEMP,
+ smu->thermal_range.software_shutdown_temp);
dev_emerg(adev->dev, "Recover soft CTF limit to %d\n", high);
data = RREG32_SOC15(THM, 0, regTHM_THERMAL_INT_CTRL);