Commit be07c00e authored Sep 03, 2013 by Zhang Rui Committed by Rafael J. Wysocki Sep 24, 2013

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

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
CC: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 2fd6f9c3

drivers/pci/pci-acpi.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,6 @@ static bool acpi_pci_power_manageable(struct pci_dev *dev)
		static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
		{
		acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
		acpi_handle tmp;
		static const u8 state_conv[] = {
		[PCI_D0] = ACPI_STATE_D0,
		[PCI_D1] = ACPI_STATE_D1,
		@@ -192,7 +191,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
		int error = -EINVAL;

		/* If the ACPI device has _EJ0, ignore the device */
		if (!handle \|\| ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp)))
		if (!handle \|\| acpi_has_method(handle, "_EJ0"))
		return -ENODEV;

		switch (state) {