On Mon, Nov 21, 2022 at 12:23 PM Luben Tuikov <luben.tuikov@xxxxxxx> wrote: > > Fix minmax warning by using min_t() macro and > explicitly specifying the assignment type. > > Signed-off-by: Luben Tuikov <luben.tuikov@xxxxxxx> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 ++++++--- > 1 file 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 5a905002252d7d..53abd770924229 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); > > base-commit: 51005ef41b7e91d1e24e2defec22bc4f1eeb7040 > -- > 2.38.1 >
