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

Commit 85dbb3d0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI / PCI: Use ACPI_COMPANION() instead of ACPI_HANDLE() 



The ACPI_HANDLE() macro evaluates ACPI_COMPANION() internally to
return the handle of the device's ACPI companion, so it is much
more straightforward and efficient to use ACPI_COMPANION()
directly to obtain the device's ACPI companion object instead of
using ACPI_HANDLE() and acpi_bus_get_device() on the returned
handle for the same thing.

Use ACPI_COMPANION() instead of ACPI_HANDLE() in the PCI ACPI support
code.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9a3c4145

drivers/pci/pci-acpi.c

+7 −9
Original line number Diff line number Diff line
@@ -170,14 +170,13 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev) 


static bool acpi_pci_power_manageable(struct pci_dev *dev)

{

	acpi_handle handle = ACPI_HANDLE(&dev->dev);



	return handle ? acpi_bus_power_manageable(handle) : false;

	struct acpi_device *adev = ACPI_COMPANION(&dev->dev);

	return adev ? acpi_device_power_manageable(adev) : false;

}



static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)

{

	acpi_handle handle = ACPI_HANDLE(&dev->dev);

	struct acpi_device *adev = ACPI_COMPANION(&dev->dev);

	static const u8 state_conv[] = {

		[PCI_D0] = ACPI_STATE_D0,

		[PCI_D1] = ACPI_STATE_D1,
@@ -188,7 +187,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_has_method(handle, "_EJ0"))

	if (!adev || acpi_has_method(adev->handle, "_EJ0"))

		return -ENODEV;



	switch (state) {
@@ -202,7 +201,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) 
	case PCI_D1:

	case PCI_D2:

	case PCI_D3hot:

		error = acpi_bus_set_power(handle, state_conv[state]);

		error = acpi_device_set_power(adev, state_conv[state]);

	}



	if (!error)
@@ -214,9 +213,8 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) 


static bool acpi_pci_can_wakeup(struct pci_dev *dev)

{

	acpi_handle handle = ACPI_HANDLE(&dev->dev);



	return handle ? acpi_bus_can_wakeup(handle) : false;

	struct acpi_device *adev = ACPI_COMPANION(&dev->dev);

	return adev ? acpi_device_can_wakeup(adev) : false;

}



static void acpi_pci_propagate_wakeup_enable(struct pci_bus *bus, bool enable)