drm/amdgpu: Fix minmax warning
authorLuben Tuikov <luben.tuikov@amd.com>
Mon, 21 Nov 2022 17:18:36 +0000 (12:18 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 23 Nov 2022 15:31:30 +0000 (10:31 -0500)
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>
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c

index 5a90500..53abd77 100644 (file)
@@ -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);