Skip to content

Commit 68b62e5

Browse files
committed
Merge tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Pull thermal fixes from Daniel Lezcano: - Fix a severe docs build failure for cpu idle cooling device (Randy Dunlap) - Fix a spelling mistake in the error message for the stm32 (Colin Ian King) * tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: thermal: stm32: fix spelling mistake "preprare" -> "prepare" Documentation: cpu-idle-cooling: fix a SEVERE docs build failure
2 parents ffda81b + 8c173d5 commit 68b62e5

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Documentation/driver-api/thermal/cpu-idle-cooling.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ We use a fixed duration of idle injection that gives an acceptable
6565
performance penalty and a fixed latency. Mitigation can be increased
6666
or decreased by modulating the duty cycle of the idle injection.
6767

68+
::
69+
6870
^
6971
|
7072
|
@@ -91,6 +93,8 @@ computed.
9193
The governor will change the cooling device state thus the duty cycle
9294
and this variation will modulate the cooling effect.
9395

96+
::
97+
9498
^
9599
|
96100
|
@@ -154,6 +158,7 @@ equation:
154158

155159
P(opp)target = ((Trunning x (P(opp)running) + (Tidle x P(opp)idle)) /
156160
(Trunning + Tidle)
161+
157162
...
158163

159164
Tidle = Trunning x ((P(opp)running / P(opp)target) - 1)

drivers/thermal/st/stm_thermal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ static int stm_thermal_probe(struct platform_device *pdev)
535535
/* Configure and enable HW sensor */
536536
ret = stm_thermal_prepare(sensor);
537537
if (ret) {
538-
dev_err(&pdev->dev, "Error preprare sensor: %d\n", ret);
538+
dev_err(&pdev->dev, "Error prepare sensor: %d\n", ret);
539539
return ret;
540540
}
541541

0 commit comments

Comments
 (0)