Skip to content

Commit 5f64117

Browse files
superm1rafaeljw
authored andcommitted
ACPI: thermal: Drop nocrt parameter
The `nocrt` module parameter has no code associated with it and does nothing. As `crt=-1` has same functionality as what nocrt should be doing drop `nocrt` and associated documentation. This should fix a quirk for Gigabyte GA-7ZX that used `nocrt` and thus didn't function properly. Fixes: 8c99fdc ("ACPI: thermal: set "thermal.nocrt" via DMI on Gigabyte GA-7ZX") Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Cc: All applicable <stable@vger.kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent fdf0eaf commit 5f64117

2 files changed

Lines changed: 1 addition & 9 deletions

File tree

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6243,10 +6243,6 @@
62436243
-1: disable all critical trip points in all thermal zones
62446244
<degrees C>: override all critical trip points
62456245

6246-
thermal.nocrt= [HW,ACPI]
6247-
Set to disable actions on ACPI thermal zone
6248-
critical and hot trip points.
6249-
62506246
thermal.off= [HW,ACPI]
62516247
1: disable ACPI thermal control
62526248

drivers/acpi/thermal.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ static int tzp;
8282
module_param(tzp, int, 0444);
8383
MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.");
8484

85-
static int nocrt;
86-
module_param(nocrt, int, 0);
87-
MODULE_PARM_DESC(nocrt, "Set to take no action upon ACPI thermal zone critical trips points.");
88-
8985
static int off;
9086
module_param(off, int, 0);
9187
MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.");
@@ -1094,7 +1090,7 @@ static int thermal_act(const struct dmi_system_id *d) {
10941090
static int thermal_nocrt(const struct dmi_system_id *d) {
10951091
pr_notice("%s detected: disabling all critical thermal trip point actions.\n",
10961092
d->ident);
1097-
nocrt = 1;
1093+
crt = -1;
10981094
return 0;
10991095
}
11001096
static int thermal_tzp(const struct dmi_system_id *d) {

0 commit comments

Comments
 (0)