提交 dd13b9a6 编写于 作者: Z Zhang Rui 提交者: Rafael J. Wysocki

fujitsu-laptop: convert acpi_get_handle() to acpi_has_method()

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: NZhang Rui <rui.zhang@intel.com>
CC: Matthew Garrett <matthew.garrett@nebula.com>
Acked-by: NJonathan Woithe <jwoithe@just42.net>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 be07c00e
...@@ -579,11 +579,10 @@ static struct platform_driver fujitsupf_driver = { ...@@ -579,11 +579,10 @@ static struct platform_driver fujitsupf_driver = {
static void dmi_check_cb_common(const struct dmi_system_id *id) static void dmi_check_cb_common(const struct dmi_system_id *id)
{ {
acpi_handle handle;
pr_info("Identified laptop model '%s'\n", id->ident); pr_info("Identified laptop model '%s'\n", id->ident);
if (use_alt_lcd_levels == -1) { if (use_alt_lcd_levels == -1) {
if (ACPI_SUCCESS(acpi_get_handle(NULL, if (acpi_has_method(NULL,
"\\_SB.PCI0.LPCB.FJEX.SBL2", &handle))) "\\_SB.PCI0.LPCB.FJEX.SBL2"))
use_alt_lcd_levels = 1; use_alt_lcd_levels = 1;
else else
use_alt_lcd_levels = 0; use_alt_lcd_levels = 0;
...@@ -646,7 +645,6 @@ static struct dmi_system_id fujitsu_dmi_table[] = { ...@@ -646,7 +645,6 @@ static struct dmi_system_id fujitsu_dmi_table[] = {
static int acpi_fujitsu_add(struct acpi_device *device) static int acpi_fujitsu_add(struct acpi_device *device)
{ {
acpi_handle handle;
int result = 0; int result = 0;
int state = 0; int state = 0;
struct input_dev *input; struct input_dev *input;
...@@ -695,8 +693,7 @@ static int acpi_fujitsu_add(struct acpi_device *device) ...@@ -695,8 +693,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
fujitsu->dev = device; fujitsu->dev = device;
if (ACPI_SUCCESS if (acpi_has_method(device->handle, METHOD_NAME__INI)) {
(acpi_get_handle(device->handle, METHOD_NAME__INI, &handle))) {
vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n"); vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n");
if (ACPI_FAILURE if (ACPI_FAILURE
(acpi_evaluate_object (acpi_evaluate_object
...@@ -796,7 +793,6 @@ static void acpi_fujitsu_notify(struct acpi_device *device, u32 event) ...@@ -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) static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
{ {
acpi_handle handle;
int result = 0; int result = 0;
int state = 0; int state = 0;
struct input_dev *input; struct input_dev *input;
...@@ -859,8 +855,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device) ...@@ -859,8 +855,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
fujitsu_hotkey->dev = device; fujitsu_hotkey->dev = device;
if (ACPI_SUCCESS if (acpi_has_method(device->handle, METHOD_NAME__INI)) {
(acpi_get_handle(device->handle, METHOD_NAME__INI, &handle))) {
vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n"); vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n");
if (ACPI_FAILURE if (ACPI_FAILURE
(acpi_evaluate_object (acpi_evaluate_object
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册