Skip to contentSkip to conversation

thermal: sprd: Fix temperature clamping in sprd_thm_temp_to_rawdata

PATCH RESEND Applied Thorsten Blum 2 participants 4 messages Mar 7 – Mar 10

Subsystems (3)
Stable branch Thermal Arm/spreadtrum SoC support
lore
Share & tools
lore

Thorsten Blum

author
#0 lore raw

PATCH RESEND 1/2 thermal: sprd: Fix temperature clamping in sprd_thm_temp_to_rawdata

The temperature was never clamped to SPRD_THM_TEMP_LOW or SPRD_THM_TEMP_HIGH because the return value of clamp() was not used. Fix this by assigning the clamped value to 'temp'.

Casting SPRD_THM_TEMP_LOW and SPRD_THM_TEMP_HIGH to int is also redundant and can be removed.

Fixes 554fdbaf19b1 ("thermal: sprd: Add Spreadtrum thermal driver support")
Cc [email protected]
Reviewed-by Baolin Wang <[email protected]>
Signed-off-by Thorsten Blum <[email protected]>
---
 drivers/thermal/sprd_thermal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/sprd_thermal.c +1 -1
index e546067c9621..70c879e75d85 100644
@@ -192,7 +192,7 @@ static int sprd_thm_temp_to_rawdata(int temp, struct sprd_thermal_sensor *sen)
 {
 	u32 val;
 
-	clamp(temp, (int)SPRD_THM_TEMP_LOW, (int)SPRD_THM_TEMP_HIGH);
+	temp = clamp(temp, SPRD_THM_TEMP_LOW, SPRD_THM_TEMP_HIGH);
 
 	/*
 	 * According to the thermal datasheet, the formula of converting
Signature · 2 lines
Thorsten Blum <[email protected]>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4
author
#1 lore raw

PATCH RESEND 2/2 thermal: sprd: Fix raw temperature clamping in sprd_thm_rawdata_to_temp

The raw temperature data was never clamped to SPRD_THM_RAW_DATA_LOW or SPRD_THM_RAW_DATA_HIGH because the return value of clamp() was not used. Fix this by assigning the clamped value to 'rawdata'.

Casting SPRD_THM_RAW_DATA_LOW and SPRD_THM_RAW_DATA_HIGH to u32 is also redundant and can be removed.

Fixes 554fdbaf19b1 ("thermal: sprd: Add Spreadtrum thermal driver support")
Cc [email protected]
Reviewed-by Baolin Wang <[email protected]>
Signed-off-by Thorsten Blum <[email protected]>
---
 drivers/thermal/sprd_thermal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/sprd_thermal.c +1 -1
index 70c879e75d85..44fa45f74da7 100644
@@ -178,7 +178,7 @@ static int sprd_thm_sensor_calibration(struct device_node *np,
 static int sprd_thm_rawdata_to_temp(struct sprd_thermal_sensor *sen,
 				    u32 rawdata)
 {
-	clamp(rawdata, (u32)SPRD_THM_RAW_DATA_LOW, (u32)SPRD_THM_RAW_DATA_HIGH);
+	rawdata = clamp(rawdata, SPRD_THM_RAW_DATA_LOW, SPRD_THM_RAW_DATA_HIGH);
 
 	/*
 	 * According to the thermal datasheet, the formula of converting
Signature · 2 lines
Thorsten Blum <[email protected]>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4
author
#2 lore raw

Re: [PATCH RESEND 2/2] thermal: sprd: Fix raw temperature clamping in sprd_thm_rawdata_to_temp

Quoted 7 lines · Thorsten Blum

The raw temperature data was never clamped to SPRD_THM_RAW_DATA_LOW or SPRD_THM_RAW_DATA_HIGH because the return value of clamp() was not used. Fix this by assigning the clamped value to 'rawdata'.

Casting SPRD_THM_RAW_DATA_LOW and SPRD_THM_RAW_DATA_HIGH to u32 is also redundant and can be removed.

Quoted 8 lines
Fixes 554fdbaf19b1 ("thermal: sprd: Add Spreadtrum thermal driver support")
Cc [email protected]
Reviewed-by Baolin Wang <[email protected]>
Signed-off-by Thorsten Blum <[email protected]>

---
drivers/thermal/sprd_thermal.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

[...]

Feel free to squash them as they touch the same file and fix the same commit.

Thanks,
Thorsten

Applied
#3 lore raw
In reply to Thorsten Blum
Quoted 4 lines · Thorsten Blum

The temperature was never clamped to SPRD_THM_TEMP_LOW or SPRD_THM_TEMP_HIGH because the return value of clamp() was not used. Fix this by assigning the clamped value to 'temp'.

Quoted 8 lines

Casting SPRD_THM_TEMP_LOW and SPRD_THM_TEMP_HIGH to int is also redundant and can be removed.

Fixes 554fdbaf19b1 ("thermal: sprd: Add Spreadtrum thermal driver support")
Cc [email protected]
Reviewed-by Baolin Wang <[email protected]>
Signed-off-by Thorsten Blum <[email protected]>

---

Applied, thanks !