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

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

ACPI / PNP: 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.

Do that in several places in the ACPI PNP core code.

Also use acpi_device_set_power() and acpi_device_power_manageable()
instead of acpi_bus_set_power() and acpi_bus_power_manageable(),
respectively, because the former two are more efficient if the
ACPI device object is already available.

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

drivers/pnp/pnpacpi/core.c

+23 −28
Original line number Original line Diff line number Diff line
@@ -67,8 +67,8 @@ static int pnpacpi_set_resources(struct pnp_dev *dev) 




	pnp_dbg(&dev->dev, "set resources\n");

	pnp_dbg(&dev->dev, "set resources\n");





	handle = ACPI_HANDLE(&dev->dev);

	acpi_dev = ACPI_COMPANION(&dev->dev);

	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

	if (!acpi_dev) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return -ENODEV;

		return -ENODEV;

	}

	}
@@ -76,6 +76,7 @@ static int pnpacpi_set_resources(struct pnp_dev *dev) 
	if (WARN_ON_ONCE(acpi_dev != dev->data))

	if (WARN_ON_ONCE(acpi_dev != dev->data))

		dev->data = acpi_dev;

		dev->data = acpi_dev;





	handle = acpi_dev->handle;

	if (acpi_has_method(handle, METHOD_NAME__SRS)) {

	if (acpi_has_method(handle, METHOD_NAME__SRS)) {

		struct acpi_buffer buffer;

		struct acpi_buffer buffer;
@@ -93,8 +94,8 @@ static int pnpacpi_set_resources(struct pnp_dev *dev) 
		}

		}

		kfree(buffer.pointer);

		kfree(buffer.pointer);

	}

	}

	if (!ret && acpi_bus_power_manageable(handle))

	if (!ret && acpi_device_power_manageable(acpi_dev))

		ret = acpi_bus_set_power(handle, ACPI_STATE_D0);

		ret = acpi_device_set_power(acpi_dev, ACPI_STATE_D0);





	return ret;

	return ret;

}

}
@@ -102,23 +103,22 @@ static int pnpacpi_set_resources(struct pnp_dev *dev) 
static int pnpacpi_disable_resources(struct pnp_dev *dev)

static int pnpacpi_disable_resources(struct pnp_dev *dev)

{

{

	struct acpi_device *acpi_dev;

	struct acpi_device *acpi_dev;

	acpi_handle handle;

	acpi_status status;

	acpi_status status;





	dev_dbg(&dev->dev, "disable resources\n");

	dev_dbg(&dev->dev, "disable resources\n");





	handle = ACPI_HANDLE(&dev->dev);

	acpi_dev = ACPI_COMPANION(&dev->dev);

	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

	if (!acpi_dev) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return 0;

		return 0;

	}

	}





	/* acpi_unregister_gsi(pnp_irq(dev, 0)); */

	/* acpi_unregister_gsi(pnp_irq(dev, 0)); */

	if (acpi_bus_power_manageable(handle))

	if (acpi_device_power_manageable(acpi_dev))

		acpi_bus_set_power(handle, ACPI_STATE_D3_COLD);

		acpi_device_set_power(acpi_dev, ACPI_STATE_D3_COLD);





	/* continue even if acpi_bus_set_power() fails */

	/* continue even if acpi_device_set_power() fails */

	status = acpi_evaluate_object(handle, "_DIS", NULL, NULL);

	status = acpi_evaluate_object(acpi_dev->handle, "_DIS", NULL, NULL);

	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)

	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)

		return -ENODEV;

		return -ENODEV;
@@ -128,26 +128,22 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev) 
#ifdef CONFIG_ACPI_SLEEP

#ifdef CONFIG_ACPI_SLEEP

static bool pnpacpi_can_wakeup(struct pnp_dev *dev)

static bool pnpacpi_can_wakeup(struct pnp_dev *dev)

{

{

	struct acpi_device *acpi_dev;

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

	acpi_handle handle;





	handle = ACPI_HANDLE(&dev->dev);

	if (!acpi_dev) {

	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return false;

		return false;

	}

	}





	return acpi_bus_can_wakeup(handle);

	return acpi_bus_can_wakeup(acpi_dev->handle);

}

}





static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)

static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)

{

{

	struct acpi_device *acpi_dev;

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

	acpi_handle handle;

	int error = 0;

	int error = 0;





	handle = ACPI_HANDLE(&dev->dev);

	if (!acpi_dev) {

	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return 0;

		return 0;

	}

	}
@@ -159,7 +155,7 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state) 
			return error;

			return error;

	}

	}





	if (acpi_bus_power_manageable(handle)) {

	if (acpi_device_power_manageable(acpi_dev)) {

		int power_state = acpi_pm_device_sleep_state(&dev->dev, NULL,

		int power_state = acpi_pm_device_sleep_state(&dev->dev, NULL,

							ACPI_STATE_D3_COLD);

							ACPI_STATE_D3_COLD);

		if (power_state < 0)

		if (power_state < 0)
@@ -167,12 +163,12 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state) 
					ACPI_STATE_D0 : ACPI_STATE_D3_COLD;

					ACPI_STATE_D0 : ACPI_STATE_D3_COLD;





		/*

		/*

		 * acpi_bus_set_power() often fails (keyboard port can't be

		 * acpi_device_set_power() can fail (keyboard port can't be

		 * powered-down?), and in any case, our return value is ignored

		 * powered-down?), and in any case, our return value is ignored

		 * by pnp_bus_suspend().  Hence we don't revert the wakeup

		 * by pnp_bus_suspend().  Hence we don't revert the wakeup

		 * setting if the set_power fails.

		 * setting if the set_power fails.

		 */

		 */

		error = acpi_bus_set_power(handle, power_state);

		error = acpi_device_set_power(acpi_dev, power_state);

	}

	}





	return error;

	return error;
@@ -180,11 +176,10 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state) 




static int pnpacpi_resume(struct pnp_dev *dev)

static int pnpacpi_resume(struct pnp_dev *dev)

{

{

	struct acpi_device *acpi_dev;

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

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

	int error = 0;

	int error = 0;





	if (!handle || acpi_bus_get_device(handle, &acpi_dev)) {

	if (!acpi_dev) {

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);

		return -ENODEV;

		return -ENODEV;

	}

	}
@@ -192,8 +187,8 @@ static int pnpacpi_resume(struct pnp_dev *dev) 
	if (device_may_wakeup(&dev->dev))

	if (device_may_wakeup(&dev->dev))

		acpi_pm_device_sleep_wake(&dev->dev, false);

		acpi_pm_device_sleep_wake(&dev->dev, false);





	if (acpi_bus_power_manageable(handle))

	if (acpi_device_power_manageable(acpi_dev))

		error = acpi_bus_set_power(handle, ACPI_STATE_D0);

		error = acpi_device_set_power(acpi_dev, ACPI_STATE_D0);





	return error;

	return error;

}

}