openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

thinkpad_acpi: Factor out get/set adaptive kbd mode 

Move the getting/setting of the adaptive keyboard mode to separate
functions, so that we can reuse them later through sysfs attributes.

Signed-off-by: Bastien Nocera <hadess@hadess.net>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
This commit is contained in:
Bastien Nocera 2015-03-02 14:45:22 +01:00 committed by Darren Hart
parent f23a5bcb70
commit f74587fb93
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/platform/x86/thinkpad_acpi.c
View File

@ -3483,6 +3483,32 @@ static const int adaptive_keyboard_modes[] = {
static bool adaptive_keyboard_mode_is_saved; static bool adaptive_keyboard_mode_is_saved;
static int adaptive_keyboard_prev_mode; static int adaptive_keyboard_prev_mode;
static int adaptive_keyboard_get_mode(void)
{
int mode = 0;
if (!acpi_evalf(hkey_handle, &mode, "GTRW", "dd", 0)) {
pr_err("Cannot read adaptive keyboard mode\n");
return -EIO;
}
return mode;
}
static int adaptive_keyboard_set_mode(int new_mode)
{
if (new_mode < 0 ||
new_mode > LAYFLAT_MODE)
return -EINVAL;
if (!acpi_evalf(hkey_handle, NULL, "STRW", "vd", new_mode)) {
pr_err("Cannot set adaptive keyboard mode\n");
return -EIO;
}
return 0;
}
static int adaptive_keyboard_get_next_mode(int mode) static int adaptive_keyboard_get_next_mode(int mode)
{ {
size_t i; size_t i;
@ -3512,39 +3538,28 @@ static bool adaptive_keyboard_hotkey_notify_hotkey(unsigned int scancode)
new_mode = adaptive_keyboard_prev_mode; new_mode = adaptive_keyboard_prev_mode;
adaptive_keyboard_mode_is_saved = false; adaptive_keyboard_mode_is_saved = false;
} else { } else {
if (!acpi_evalf( current_mode = adaptive_keyboard_get_mode();
hkey_handle, &current_mode, if (current_mode < 0)
"GTRW", "dd", 0)) {
pr_err("Cannot read adaptive keyboard mode\n");
return false; return false;
} else { new_mode = adaptive_keyboard_get_next_mode(
new_mode = adaptive_keyboard_get_next_mode( current_mode);
current_mode);
}
} }
if (!acpi_evalf(hkey_handle, NULL, "STRW", "vd", new_mode)) { if (adaptive_keyboard_set_mode(new_mode) < 0)
pr_err("Cannot set adaptive keyboard mode\n");
return false; return false;
}
return true; return true;
case DFR_SHOW_QUICKVIEW_ROW: case DFR_SHOW_QUICKVIEW_ROW:
if (!acpi_evalf(hkey_handle, current_mode = adaptive_keyboard_get_mode();
&adaptive_keyboard_prev_mode, if (current_mode < 0)
"GTRW", "dd", 0)) {
pr_err("Cannot read adaptive keyboard mode\n");
return false; return false;
} else {
adaptive_keyboard_mode_is_saved = true;
if (!acpi_evalf(hkey_handle, adaptive_keyboard_prev_mode = current_mode;
NULL, "STRW", "vd", FUNCTION_MODE)) { adaptive_keyboard_mode_is_saved = true;
pr_err("Cannot set adaptive keyboard mode\n");
return false; if (adaptive_keyboard_set_mode (FUNCTION_MODE) < 0)
} return false;
}
return true; return true;
default: default: