platform/x86: fujitsu-laptop: simplify call_fext_func()

acpi_evaluate_integer() takes a pathname parameter which contains the
name of the entity to evaluate underneath the given handle, so calling
acpi_get_handle() beforehand is redundant.  Replace the call to
acpi_get_handle() with a call to acpi_evaluate_integer(), thus
eliminating the need for a local variable storing the handle.  Adjust
whitespace to make checkpatch happy.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Reviewed-by: Jonathan Woithe <jwoithe@just42.net>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index ca1491ff659e8cb1ccd8b8473d02853e04da6b0f..e5413d268b24f5ef3d69e1cd81312d8bedba7e5b 100644 (file)
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -228,20 +228,11 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2)
        struct acpi_object_list arg_list = { 4, params };
        unsigned long long value;
        acpi_status status;
-       acpi_handle handle;
 
-       status = acpi_get_handle(fujitsu_laptop->acpi_handle, "FUNC", &handle);
+       status = acpi_evaluate_integer(fujitsu_laptop->acpi_handle, "FUNC",
+                                      &arg_list, &value);
        if (ACPI_FAILURE(status)) {
-               vdbg_printk(FUJLAPTOP_DBG_ERROR,
-                               "FUNC interface is not present\n");
-               return -ENODEV;
-       }
-
-       status = acpi_evaluate_integer(handle, NULL, &arg_list, &value);
-       if (ACPI_FAILURE(status)) {
-               vdbg_printk(FUJLAPTOP_DBG_WARN,
-                       "FUNC 0x%x (args 0x%x, 0x%x, 0x%x) call failed\n",
-                               cmd, arg0, arg1, arg2);
+               vdbg_printk(FUJLAPTOP_DBG_ERROR, "FUNC interface is not present\n");
                return -ENODEV;
        }