diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-14 18:14:02 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-14 18:14:02 +0300 |
| commit | 065ca2a8c6ee601d990ea10efc71b861c5afc4fd (patch) | |
| tree | b158f7026bdf08cbc2fdd7675568e76342af4336 /drivers/platform | |
| parent | 117e4e5bd9d47b89777dbf6b37a709dcfe59520f (diff) | |
| parent | d4d8516624e1042d33011cf93b6e9c220a22c9f0 (diff) | |
| download | linux-065ca2a8c6ee601d990ea10efc71b861c5afc4fd.tar.xz | |
Merge back Intel thermal control material for 6.4-rc1.
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/acerhdf.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index a48638ad2a8a..5c9293e7eccb 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c @@ -79,7 +79,6 @@ static unsigned int list_supported; static unsigned int fanstate = ACERHDF_FAN_AUTO; static char force_bios[16]; static char force_product[16]; -static unsigned int prev_interval; static struct thermal_zone_device *thz_dev; static struct thermal_cooling_device *cl_dev; static struct platform_device *acerhdf_dev; @@ -346,20 +345,15 @@ static void acerhdf_check_param(struct thermal_zone_device *thermal) trips[0].temperature = fanon; trips[0].hysteresis = fanon - fanoff; - if (kernelmode && prev_interval != interval) { + if (kernelmode) { if (interval > ACERHDF_MAX_INTERVAL) { pr_err("interval too high, set to %d\n", ACERHDF_MAX_INTERVAL); interval = ACERHDF_MAX_INTERVAL; } + if (verbose) pr_notice("interval changed to: %d\n", interval); - - if (thermal) - thermal->polling_delay_jiffies = - round_jiffies(msecs_to_jiffies(interval * 1000)); - - prev_interval = interval; } } @@ -697,13 +691,6 @@ static int __init acerhdf_register_thermal(void) if (ret) return ret; - if (strcmp(thz_dev->governor->name, - acerhdf_zone_params.governor_name)) { - pr_err("Didn't get thermal governor %s, perhaps not compiled into thermal subsystem.\n", - acerhdf_zone_params.governor_name); - return -EINVAL; - } - return 0; } @@ -801,5 +788,5 @@ static const struct kernel_param_ops interval_ops = { .get = param_get_uint, }; -module_param_cb(interval, &interval_ops, &interval, 0600); +module_param_cb(interval, &interval_ops, &interval, 0000); MODULE_PARM_DESC(interval, "Polling interval of temperature check"); |