* [PATCH 2/4] thinkpad_acpi: Factor out get/set adaptive kbd mode
@ 2015-03-02 13:45 Bastien Nocera
2015-03-02 17:12 ` ibm-acpi
2015-03-02 17:14 ` Henrique de Moraes Holschuh
0 siblings, 2 replies; 3+ messages in thread
From: Bastien Nocera @ 2015-03-02 13:45 UTC (permalink / raw)
To: Henrique de Moraes Holschuh, Darren Hart, ibm-acpi-devel,
platform-driver-x86, linux-kernel@vger.kernel.org, linux-input,
Jiri Kosina
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>
---
drivers/platform/x86/thinkpad_acpi.c | 61 ++++++++++++++++++++++--------------
1 file changed, 38 insertions(+), 23 deletions(-)
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 763aef0..5dea4c2 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3483,6 +3483,32 @@ static const int adaptive_keyboard_modes[] = {
static bool adaptive_keyboard_mode_is_saved;
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)
{
size_t i;
@@ -3512,39 +3538,28 @@ static bool adaptive_keyboard_hotkey_notify_hotkey(unsigned int scancode)
new_mode = adaptive_keyboard_prev_mode;
adaptive_keyboard_mode_is_saved = false;
} else {
- if (!acpi_evalf(
- hkey_handle, ¤t_mode,
- "GTRW", "dd", 0)) {
- pr_err("Cannot read adaptive keyboard mode\n");
+ current_mode = adaptive_keyboard_get_mode();
+ if (current_mode < 0)
return false;
- } else {
- new_mode = adaptive_keyboard_get_next_mode(
- current_mode);
- }
+ new_mode = adaptive_keyboard_get_next_mode(
+ current_mode);
}
- if (!acpi_evalf(hkey_handle, NULL, "STRW", "vd", new_mode)) {
- pr_err("Cannot set adaptive keyboard mode\n");
+ if (adaptive_keyboard_set_mode(new_mode) < 0)
return false;
- }
return true;
case DFR_SHOW_QUICKVIEW_ROW:
- if (!acpi_evalf(hkey_handle,
- &adaptive_keyboard_prev_mode,
- "GTRW", "dd", 0)) {
- pr_err("Cannot read adaptive keyboard mode\n");
+ current_mode = adaptive_keyboard_get_mode();
+ if (current_mode < 0)
return false;
- } else {
- adaptive_keyboard_mode_is_saved = true;
- if (!acpi_evalf(hkey_handle,
- NULL, "STRW", "vd", FUNCTION_MODE)) {
- pr_err("Cannot set adaptive keyboard mode\n");
- return false;
- }
- }
+ adaptive_keyboard_prev_mode = current_mode;
+ adaptive_keyboard_mode_is_saved = true;
+
+ if (adaptive_keyboard_set_mode (FUNCTION_MODE) < 0)
+ return false;
return true;
default:
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] thinkpad_acpi: Factor out get/set adaptive kbd mode
2015-03-02 13:45 [PATCH 2/4] thinkpad_acpi: Factor out get/set adaptive kbd mode Bastien Nocera
@ 2015-03-02 17:12 ` ibm-acpi
2015-03-02 17:14 ` Henrique de Moraes Holschuh
1 sibling, 0 replies; 3+ messages in thread
From: ibm-acpi @ 2015-03-02 17:12 UTC (permalink / raw)
To: Bastien Nocera, Darren Hart, ibm-acpi-devel, platform-driver-x86,
linux-kernel, linux-input, Jiri Kosina
On Mon, Mar 2, 2015, at 10:45, Bastien Nocera wrote:
> 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>
> ---
> drivers/platform/x86/thinkpad_acpi.c | 61
> ++++++++++++++++++++++--------------
> 1 file changed, 38 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/platform/x86/thinkpad_acpi.c
> b/drivers/platform/x86/thinkpad_acpi.c
> index 763aef0..5dea4c2 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -3483,6 +3483,32 @@ static const int adaptive_keyboard_modes[] = {
> static bool adaptive_keyboard_mode_is_saved;
> 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)
> {
> size_t i;
> @@ -3512,39 +3538,28 @@ static bool
> adaptive_keyboard_hotkey_notify_hotkey(unsigned int scancode)
> new_mode = adaptive_keyboard_prev_mode;
> adaptive_keyboard_mode_is_saved = false;
> } else {
> - if (!acpi_evalf(
> - hkey_handle, ¤t_mode,
> - "GTRW", "dd", 0)) {
> - pr_err("Cannot read adaptive keyboard
> mode\n");
> + current_mode = adaptive_keyboard_get_mode();
> + if (current_mode < 0)
> return false;
> - } else {
> - new_mode =
> adaptive_keyboard_get_next_mode(
> - current_mode);
> - }
> + new_mode = adaptive_keyboard_get_next_mode(
> + current_mode);
> }
>
> - if (!acpi_evalf(hkey_handle, NULL, "STRW", "vd",
> new_mode)) {
> - pr_err("Cannot set adaptive keyboard mode\n");
> + if (adaptive_keyboard_set_mode(new_mode) < 0)
> return false;
> - }
>
> return true;
>
> case DFR_SHOW_QUICKVIEW_ROW:
> - if (!acpi_evalf(hkey_handle,
> - &adaptive_keyboard_prev_mode,
> - "GTRW", "dd", 0)) {
> - pr_err("Cannot read adaptive keyboard mode\n");
> + current_mode = adaptive_keyboard_get_mode();
> + if (current_mode < 0)
> return false;
> - } else {
> - adaptive_keyboard_mode_is_saved = true;
>
> - if (!acpi_evalf(hkey_handle,
> - NULL, "STRW", "vd",
> FUNCTION_MODE)) {
> - pr_err("Cannot set adaptive keyboard
> mode\n");
> - return false;
> - }
> - }
> + adaptive_keyboard_prev_mode = current_mode;
> + adaptive_keyboard_mode_is_saved = true;
> +
> + if (adaptive_keyboard_set_mode (FUNCTION_MODE) < 0)
> + return false;
> return true;
>
> default:
> --
> 2.1.0
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] thinkpad_acpi: Factor out get/set adaptive kbd mode
2015-03-02 13:45 [PATCH 2/4] thinkpad_acpi: Factor out get/set adaptive kbd mode Bastien Nocera
2015-03-02 17:12 ` ibm-acpi
@ 2015-03-02 17:14 ` Henrique de Moraes Holschuh
1 sibling, 0 replies; 3+ messages in thread
From: Henrique de Moraes Holschuh @ 2015-03-02 17:14 UTC (permalink / raw)
To: Bastien Nocera, Darren Hart, ibm-acpi-devel, platform-driver-x86,
linux-kernel, linux-input, Jiri Kosina
On Mon, Mar 2, 2015, at 10:45, Bastien Nocera wrote:
> 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>
> ---
> drivers/platform/x86/thinkpad_acpi.c | 61
> ++++++++++++++++++++++--------------
> 1 file changed, 38 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/platform/x86/thinkpad_acpi.c
> b/drivers/platform/x86/thinkpad_acpi.c
> index 763aef0..5dea4c2 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -3483,6 +3483,32 @@ static const int adaptive_keyboard_modes[] = {
> static bool adaptive_keyboard_mode_is_saved;
> 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)
> {
> size_t i;
> @@ -3512,39 +3538,28 @@ static bool
> adaptive_keyboard_hotkey_notify_hotkey(unsigned int scancode)
> new_mode = adaptive_keyboard_prev_mode;
> adaptive_keyboard_mode_is_saved = false;
> } else {
> - if (!acpi_evalf(
> - hkey_handle, ¤t_mode,
> - "GTRW", "dd", 0)) {
> - pr_err("Cannot read adaptive keyboard
> mode\n");
> + current_mode = adaptive_keyboard_get_mode();
> + if (current_mode < 0)
> return false;
> - } else {
> - new_mode =
> adaptive_keyboard_get_next_mode(
> - current_mode);
> - }
> + new_mode = adaptive_keyboard_get_next_mode(
> + current_mode);
> }
>
> - if (!acpi_evalf(hkey_handle, NULL, "STRW", "vd",
> new_mode)) {
> - pr_err("Cannot set adaptive keyboard mode\n");
> + if (adaptive_keyboard_set_mode(new_mode) < 0)
> return false;
> - }
>
> return true;
>
> case DFR_SHOW_QUICKVIEW_ROW:
> - if (!acpi_evalf(hkey_handle,
> - &adaptive_keyboard_prev_mode,
> - "GTRW", "dd", 0)) {
> - pr_err("Cannot read adaptive keyboard mode\n");
> + current_mode = adaptive_keyboard_get_mode();
> + if (current_mode < 0)
> return false;
> - } else {
> - adaptive_keyboard_mode_is_saved = true;
>
> - if (!acpi_evalf(hkey_handle,
> - NULL, "STRW", "vd",
> FUNCTION_MODE)) {
> - pr_err("Cannot set adaptive keyboard
> mode\n");
> - return false;
> - }
> - }
> + adaptive_keyboard_prev_mode = current_mode;
> + adaptive_keyboard_mode_is_saved = true;
> +
> + if (adaptive_keyboard_set_mode (FUNCTION_MODE) < 0)
> + return false;
> return true;
>
> default:
> --
> 2.1.0
>
>
--
"One disk to rule them all, One disk to find them. One disk to bring
them all and in the darkness grind them. In the Land of Redmond
where the shadows lie." -- The Silicon Valley Tarot
Henrique Holschuh
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-02 17:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-02 13:45 [PATCH 2/4] thinkpad_acpi: Factor out get/set adaptive kbd mode Bastien Nocera
2015-03-02 17:12 ` ibm-acpi
2015-03-02 17:14 ` Henrique de Moraes Holschuh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox