All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zhang Rui <rui.zhang@intel.com>
To: rjw@sisk.pl
Cc: linux-pm@vger.kernel.org, Zhang Rui <rui.zhang@intel.com>,
	Matthew Garrett <matthew.garrett@nebula.com>,
	Jonathan Woithe <jwoithe@physics.adelaide.edu.au>,
	platform-driver-x86@vger.kernel.org
Subject: [PATCH 15/27] fujitsu-laptop: convert acpi_get_handle() to acpi_has_method()
Date: Tue,  3 Sep 2013 08:32:03 +0800	[thread overview]
Message-ID: <1378168335-22556-16-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1378168335-22556-1-git-send-email-rui.zhang@intel.com>

acpi_has_method() is a new ACPI API introduced to check
the existence of an ACPI control method.

It can be used to replace acpi_get_handle() in the case that
1. the calling function doesn't need the ACPI handle of the control method.
and
2. the calling function doesn't care the reason why the method is unavailable.

Convert acpi_get_handle() to acpi_has_method()
in drivers/platform/x86/fujitsu-laptop.c in this patch.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
CC: Matthew Garrett <matthew.garrett@nebula.com>
CC: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
CC: platform-driver-x86@vger.kernel.org
---
 drivers/platform/x86/fujitsu-laptop.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 29738cb..765d8c1 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -579,11 +579,10 @@ static struct platform_driver fujitsupf_driver = {
 
 static void dmi_check_cb_common(const struct dmi_system_id *id)
 {
-	acpi_handle handle;
 	pr_info("Identified laptop model '%s'\n", id->ident);
 	if (use_alt_lcd_levels == -1) {
-		if (ACPI_SUCCESS(acpi_get_handle(NULL,
-				"\\_SB.PCI0.LPCB.FJEX.SBL2", &handle)))
+		if (acpi_has_method(NULL,
+				"\\_SB.PCI0.LPCB.FJEX.SBL2"))
 			use_alt_lcd_levels = 1;
 		else
 			use_alt_lcd_levels = 0;
@@ -646,7 +645,6 @@ static struct dmi_system_id fujitsu_dmi_table[] = {
 
 static int acpi_fujitsu_add(struct acpi_device *device)
 {
-	acpi_handle handle;
 	int result = 0;
 	int state = 0;
 	struct input_dev *input;
@@ -695,8 +693,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
 
 	fujitsu->dev = device;
 
-	if (ACPI_SUCCESS
-	    (acpi_get_handle(device->handle, METHOD_NAME__INI, &handle))) {
+	if (acpi_has_method(device->handle, METHOD_NAME__INI)) {
 		vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n");
 		if (ACPI_FAILURE
 		    (acpi_evaluate_object
@@ -796,7 +793,6 @@ static void acpi_fujitsu_notify(struct acpi_device *device, u32 event)
 
 static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
 {
-	acpi_handle handle;
 	int result = 0;
 	int state = 0;
 	struct input_dev *input;
@@ -859,8 +855,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
 
 	fujitsu_hotkey->dev = device;
 
-	if (ACPI_SUCCESS
-	    (acpi_get_handle(device->handle, METHOD_NAME__INI, &handle))) {
+	if (acpi_has_method(device->handle, METHOD_NAME__INI)) {
 		vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n");
 		if (ACPI_FAILURE
 		    (acpi_evaluate_object
-- 
1.8.1.2

  parent reply	other threads:[~2013-09-03  0:31 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-03  0:31 [PATCH 00/27] ACPI AML helper conversion Zhang Rui
2013-09-03  0:31 ` [PATCH 01/27] olpc_xo15_sci: convert acpi_evaluate_object() to acpi_execute_simple_method() Zhang Rui
2013-09-03  0:31 ` [PATCH 02/27] gpiolib-acpi: " Zhang Rui
2013-09-03  7:17   ` Mika Westerberg
2013-09-03  7:42   ` Mathias Nyman
2013-09-17 12:55   ` Linus Walleij
2013-09-03  0:31 ` [PATCH 03/27] eeepc-laptop: " Zhang Rui
2013-09-03  0:31 ` [PATCH 04/27] fujitsu-laptop: " Zhang Rui
2013-09-03 13:11   ` Jonathan Woithe
2013-09-03  0:31 ` [PATCH 05/27] intel-rst: " Zhang Rui
2013-09-03  0:31 ` [PATCH 06/27] intel-smartconnect: " Zhang Rui
2013-09-03  0:31 ` [PATCH 07/27] topstar-laptop: " Zhang Rui
2013-09-03  0:31 ` [PATCH 08/27] toshiba_acpi: " Zhang Rui
2013-09-03  0:31 ` [PATCH 09/27] wmi: " Zhang Rui
2013-09-03  0:31 ` [PATCH 10/27] pcc_freq: convert acpi_get_handle() to acpi_has_method() Zhang Rui
2013-09-03  0:31 ` [PATCH 11/27] i915: intel_acpi: " Zhang Rui
2013-09-09  8:57   ` Daniel Vetter
2013-09-03  0:32 ` [PATCH 12/27] nouveau_acpi: " Zhang Rui
2013-09-03  0:32 ` [PATCH 13/27] acpi_pcihp: " Zhang Rui
2013-09-03  0:32 ` [PATCH 14/27] pci-acpi: " Zhang Rui
2013-09-03  0:32 ` Zhang Rui [this message]
2013-09-03 13:11   ` [PATCH 15/27] fujitsu-laptop: " Jonathan Woithe
2013-09-03  0:32 ` [PATCH 16/27] intel_menlow: " Zhang Rui
2013-09-03  0:32 ` [PATCH 17/27] sony-laptop: " Zhang Rui
2013-09-03  0:32 ` [PATCH 18/27] toshiba_acpi: " Zhang Rui
2013-09-03  0:32 ` [PATCH 19/27] wmi: " Zhang Rui
2013-09-03  0:32 ` [PATCH 20/27] pnpacpi: " Zhang Rui
2013-09-03  0:32 ` [PATCH 21/27] acpi_processor: convert acpi_evaluate_object() to acpi_evaluate_integer() Zhang Rui
2013-09-03  0:32 ` [PATCH 22/27] ACPI: dock: " Zhang Rui
2013-09-03  0:32 ` [PATCH 23/27] i2c-hid: " Zhang Rui
2013-09-04 10:14   ` Jiri Kosina
2013-09-06  8:17     ` Benjamin Tissoires
2013-09-03  0:32 ` [PATCH 24/27] fujitsu-laptop: " Zhang Rui
2013-09-03 13:12   ` Jonathan Woithe
2013-09-03  0:32 ` [PATCH 25/27] intel-rst: " Zhang Rui
2013-09-03  0:32 ` [PATCH 26/27] intel-smartconnect: " Zhang Rui
2013-09-03  0:32 ` [PATCH 27/27] toshiba_acpi: " Zhang Rui
2013-09-03 11:24 ` [PATCH 00/27] ACPI AML helper conversion Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1378168335-22556-16-git-send-email-rui.zhang@intel.com \
    --to=rui.zhang@intel.com \
    --cc=jwoithe@physics.adelaide.edu.au \
    --cc=linux-pm@vger.kernel.org \
    --cc=matthew.garrett@nebula.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rjw@sisk.pl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.