Commit e8b7eb66 authored by Hans de Goede's avatar Hans de Goede

platform/x86: thinkpad_acpi: Get privacy-screen / lcdshadow ACPI handles only once

Get the privacy-screen / lcdshadow ACPI handles once and cache them,
instead of retrieving them every time we need them.
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarMark Pearson <markpearson@lenovo.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211005202322.700909-8-hdegoede@redhat.com
parent 1b8101d5
...@@ -9819,19 +9819,15 @@ static struct ibm_struct battery_driver_data = { ...@@ -9819,19 +9819,15 @@ static struct ibm_struct battery_driver_data = {
* LCD Shadow subdriver, for the Lenovo PrivacyGuard feature * LCD Shadow subdriver, for the Lenovo PrivacyGuard feature
*/ */
static acpi_handle lcdshadow_get_handle;
static acpi_handle lcdshadow_set_handle;
static int lcdshadow_state; static int lcdshadow_state;
static int lcdshadow_on_off(bool state) static int lcdshadow_on_off(bool state)
{ {
acpi_handle set_shadow_handle;
int output; int output;
if (ACPI_FAILURE(acpi_get_handle(hkey_handle, "SSSS", &set_shadow_handle))) { if (!acpi_evalf(lcdshadow_set_handle, &output, NULL, "dd", (int)state))
pr_warn("Thinkpad ACPI has no %s interface.\n", "SSSS");
return -EIO;
}
if (!acpi_evalf(set_shadow_handle, &output, NULL, "dd", (int)state))
return -EIO; return -EIO;
lcdshadow_state = state; lcdshadow_state = state;
...@@ -9849,15 +9845,17 @@ static int lcdshadow_set(bool on) ...@@ -9849,15 +9845,17 @@ static int lcdshadow_set(bool on)
static int tpacpi_lcdshadow_init(struct ibm_init_struct *iibm) static int tpacpi_lcdshadow_init(struct ibm_init_struct *iibm)
{ {
acpi_handle get_shadow_handle; acpi_status status1, status2;
int output; int output;
if (ACPI_FAILURE(acpi_get_handle(hkey_handle, "GSSS", &get_shadow_handle))) { status1 = acpi_get_handle(hkey_handle, "GSSS", &lcdshadow_get_handle);
status2 = acpi_get_handle(hkey_handle, "SSSS", &lcdshadow_set_handle);
if (ACPI_FAILURE(status1) || ACPI_FAILURE(status2)) {
lcdshadow_state = -ENODEV; lcdshadow_state = -ENODEV;
return 0; return 0;
} }
if (!acpi_evalf(get_shadow_handle, &output, NULL, "dd", 0)) { if (!acpi_evalf(lcdshadow_get_handle, &output, NULL, "dd", 0)) {
lcdshadow_state = -EIO; lcdshadow_state = -EIO;
return -EIO; return -EIO;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment