diff options
| author | Dmitry Torokhov <[email protected]> | 2023-05-01 15:20:08 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-05-01 15:20:08 -0700 |
| commit | 9a87ffc99ec8eb8d35eed7c4f816d75f5cc9662e (patch) | |
| tree | d57f3a63479a07b4e0cece029886e76e04feb984 /drivers/thermal/intel/intel_menlow.c | |
| parent | 5dc63e56a9cf8df0b59c234a505a1653f1bdf885 (diff) | |
| parent | 53bea86b5712c7491bb3dae12e271666df0a308c (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.4 merge window.
Diffstat (limited to 'drivers/thermal/intel/intel_menlow.c')
| -rw-r--r-- | drivers/thermal/intel/intel_menlow.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/thermal/intel/intel_menlow.c b/drivers/thermal/intel/intel_menlow.c index 3f885b08a490..5a6ad0552311 100644 --- a/drivers/thermal/intel/intel_menlow.c +++ b/drivers/thermal/intel/intel_menlow.c @@ -232,9 +232,9 @@ static DEFINE_MUTEX(intel_menlow_attr_lock); /* * sensor_get_auxtrip - get the current auxtrip value from sensor - * @name: Thermalzone name - * @auxtype : AUX0/AUX1 - * @buf: syfs buffer + * @handle: Object handle + * @index : GET_AUX1/GET_AUX0 + * @value : The address will be fill by the value */ static int sensor_get_auxtrip(acpi_handle handle, int index, unsigned long long *value) @@ -254,9 +254,9 @@ static int sensor_get_auxtrip(acpi_handle handle, int index, /* * sensor_set_auxtrip - set the new auxtrip value to sensor - * @name: Thermalzone name - * @auxtype : AUX0/AUX1 - * @buf: syfs buffer + * @handle: Object handle + * @index : GET_AUX1/GET_AUX0 + * @value : The value will be set */ static int sensor_set_auxtrip(acpi_handle handle, int index, int value) { |