| Message ID | 20241124171426.29203-5-W_Armin@gmx.de (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | platform/x86: acer-wmi: Various improvements | expand |
On Sun, 24 Nov 2024, Armin Wolf wrote: > If a call to ACER_WMID_GET_GAMING_SYS_INFO_METHODID fails, the lower > 8 bits will be non-zero. Use WMID_gaming_get_sys_info() to check for > this when reading the AC status. > > Signed-off-by: Armin Wolf <W_Armin@gmx.de> > --- > drivers/platform/x86/acer-wmi.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c > index 7b549920eba7..6964fea84fa1 100644 > --- a/drivers/platform/x86/acer-wmi.c > +++ b/drivers/platform/x86/acer-wmi.c > @@ -1951,12 +1951,9 @@ static int acer_thermal_profile_change(void) > return err; > > /* Check power source */ > - status = WMI_gaming_execute_u64( > - ACER_WMID_GET_GAMING_SYS_INFO_METHODID, > - ACER_WMID_CMD_GET_PREDATOR_V4_BAT_STATUS, &on_AC); > - > - if (ACPI_FAILURE(status)) > - return -EIO; > + err = WMID_gaming_get_sys_info(ACER_WMID_CMD_GET_PREDATOR_V4_BAT_STATUS, &on_AC); > + if (err < 0) > + return err; > > switch (current_tp) { > case ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO: > -- > 2.39.5 > I'd add WMID_gaming_get_sys_info() in this change and reorder the series so that this comes before the fan/temp/hwmon changes.
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 7b549920eba7..6964fea84fa1 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -1951,12 +1951,9 @@ static int acer_thermal_profile_change(void) return err; /* Check power source */ - status = WMI_gaming_execute_u64( - ACER_WMID_GET_GAMING_SYS_INFO_METHODID, - ACER_WMID_CMD_GET_PREDATOR_V4_BAT_STATUS, &on_AC); - - if (ACPI_FAILURE(status)) - return -EIO; + err = WMID_gaming_get_sys_info(ACER_WMID_CMD_GET_PREDATOR_V4_BAT_STATUS, &on_AC); + if (err < 0) + return err; switch (current_tp) { case ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO:
If a call to ACER_WMID_GET_GAMING_SYS_INFO_METHODID fails, the lower 8 bits will be non-zero. Use WMID_gaming_get_sys_info() to check for this when reading the AC status. Signed-off-by: Armin Wolf <W_Armin@gmx.de> --- drivers/platform/x86/acer-wmi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.39.5