Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1615030

[PATCH 2/3] platform/x86: fujitsu-laptop: simplify call_fext_func()

Show all headers | View raw

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>
---
 drivers/platform/x86/fujitsu-laptop.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index ca1491ff659e..e5413d268b24 100644
--- 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;
 	}
 
-- 
2.12.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] fujitsu-laptop: call_fext_func() cleanup Michał Kępień <kernel@kempniu.pl> - 2017-04-03 11:40 +0200
  [PATCH 2/3] platform/x86: fujitsu-laptop: simplify call_fext_func() Michał Kępień <kernel@kempniu.pl> - 2017-04-03 11:40 +0200
  [PATCH 3/3] platform/x86: fujitsu-laptop: rename call_fext_func() arguments Michał Kępień <kernel@kempniu.pl> - 2017-04-03 11:40 +0200
  Re: [PATCH 0/3] fujitsu-laptop: call_fext_func() cleanup Darren Hart <dvhart@infradead.org> - 2017-04-04 00:20 +0200
    Re: [PATCH 0/3] fujitsu-laptop: call_fext_func() cleanup Jonathan Woithe <jwoithe@just42.net> - 2017-04-04 01:50 +0200
      Re: [PATCH 0/3] fujitsu-laptop: call_fext_func() cleanup Darren Hart <dvhart@infradead.org> - 2017-04-04 03:20 +0200

csiph-web