Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fd6f9c3 authored by Zhang Rui's avatar Zhang Rui Committed by Rafael J. Wysocki
Browse files

acpi_pcihp: 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/pci/hotplug/acpi_pcihp.c in this patch.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
CC: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 187b5b5d

drivers/pci/hotplug/acpi_pcihp.c

+2 −5
Original line number Diff line number Diff line
@@ -411,13 +411,10 @@ EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware); 
static int pcihp_is_ejectable(acpi_handle handle)

{

	acpi_status status;

	acpi_handle tmp;

	unsigned long long removable;

	status = acpi_get_handle(handle, "_ADR", &tmp);

	if (ACPI_FAILURE(status))

	if (!acpi_has_method(handle, "_ADR"))

		return 0;

	status = acpi_get_handle(handle, "_EJ0", &tmp);

	if (ACPI_SUCCESS(status))

	if (acpi_has_method(handle, "_EJ0"))

		return 1;

	status = acpi_evaluate_integer(handle, "_RMV", NULL, &removable);

	if (ACPI_SUCCESS(status) && removable)