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

Merge branch 'acpi-dev' 

Merge changes regarding the management of ACPI device objects for
6.1-rc1:

 - Rename ACPI device object reference counting functions (Rafael
   Wysocki).

 - Rearrange ACPI device object initialization code (Rafael Wysocki).

 - Drop parent field from struct acpi_device (Rafael Wysocki).

 - Extend the the int3472-tps68470 driver to support multiple consumers
   of a single TPS68470 along with the requisite framework-level
   support (Daniel Scally).

* acpi-dev:
  platform/x86: int3472: Add board data for Surface Go2 IR camera
  platform/x86: int3472: Support multiple gpio lookups in board data
  platform/x86: int3472: Support multiple clock consumers
  ACPI: bus: Add iterator for dependent devices
  ACPI: scan: Add acpi_dev_get_next_consumer_dev()
  ACPI: property: Use acpi_dev_parent()
  ACPI: Drop redundant acpi_dev_parent() header
  ACPI: PM: Fix NULL argument handling in acpi_device_get/set_power()
  ACPI: Drop parent field from struct acpi_device
  ACPI: scan: Eliminate __acpi_device_add()
  ACPI: scan: Rearrange initialization of ACPI device objects
  ACPI: scan: Rename acpi_bus_get_parent() and rearrange it
  ACPI: Rename acpi_bus_get/put_acpi_device()
parents 63f534b8 2a5a191c

drivers/acpi/acpi_amba.c

+3 −2
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static void amba_register_dummy_clk(void) 
static int amba_handler_attach(struct acpi_device *adev,

				const struct acpi_device_id *id)

{

	struct acpi_device *parent = acpi_dev_parent(adev);

	struct amba_device *dev;

	struct resource_entry *rentry;

	struct list_head resource_list;
@@ -97,8 +98,8 @@ static int amba_handler_attach(struct acpi_device *adev, 
	 * attached to it, that physical device should be the parent of

	 * the amba device we are about to create.

	 */

	if (adev->parent)

		dev->dev.parent = acpi_get_first_physical_node(adev->parent);

	if (parent)

		dev->dev.parent = acpi_get_first_physical_node(parent);



	ACPI_COMPANION_SET(&dev->dev, adev);

drivers/acpi/acpi_platform.c

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, 
	 * If the device has parent we need to take its resources into

	 * account as well because this device might consume part of those.

	 */

	parent = acpi_get_first_physical_node(adev->parent);

	parent = acpi_get_first_physical_node(acpi_dev_parent(adev));

	if (parent && dev_is_pci(parent))

		dest->parent = pci_find_resource(to_pci_dev(parent), dest);

}
@@ -97,6 +97,7 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, 
struct platform_device *acpi_create_platform_device(struct acpi_device *adev,

						    const struct property_entry *properties)

{

	struct acpi_device *parent = acpi_dev_parent(adev);

	struct platform_device *pdev = NULL;

	struct platform_device_info pdevinfo;

	struct resource_entry *rentry;
@@ -137,8 +138,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev, 
	 * attached to it, that physical device should be the parent of the

	 * platform device we are about to create.

	 */

	pdevinfo.parent = adev->parent ?

		acpi_get_first_physical_node(adev->parent) : NULL;

	pdevinfo.parent = parent ? acpi_get_first_physical_node(parent) : NULL;

	pdevinfo.name = dev_name(&adev->dev);

	pdevinfo.id = -1;

	pdevinfo.res = resources;

drivers/acpi/acpi_video.c

+1 −1
Original line number Diff line number Diff line
@@ -2030,7 +2030,7 @@ static int acpi_video_bus_add(struct acpi_device *device) 
	acpi_status status;



	status = acpi_walk_namespace(ACPI_TYPE_DEVICE,

				device->parent->handle, 1,

				acpi_dev_parent(device)->handle, 1,

				acpi_video_bus_match, NULL,

				device, NULL);

	if (status == AE_ALREADY_EXISTS) {

drivers/acpi/bus.c

+3 −3
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) 
		break;

	}



	adev = acpi_bus_get_acpi_device(handle);

	adev = acpi_get_acpi_dev(handle);

	if (!adev)

		goto err;
@@ -524,14 +524,14 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) 
	}



	if (!hotplug_event) {

		acpi_bus_put_acpi_device(adev);

		acpi_put_acpi_dev(adev);

		return;

	}



	if (ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))

		return;



	acpi_bus_put_acpi_device(adev);

	acpi_put_acpi_dev(adev);



 err:

	acpi_evaluate_ost(handle, type, ost_code, NULL);

drivers/acpi/device_pm.c

+21 −15
Original line number Diff line number Diff line
@@ -75,15 +75,17 @@ static int acpi_dev_pm_explicit_get(struct acpi_device *device, int *state) 
int acpi_device_get_power(struct acpi_device *device, int *state)

{

	int result = ACPI_STATE_UNKNOWN;

	struct acpi_device *parent;

	int error;



	if (!device || !state)

		return -EINVAL;



	parent = acpi_dev_parent(device);



	if (!device->flags.power_manageable) {

		/* TBD: Non-recursive algorithm for walking up hierarchy. */

		*state = device->parent ?

			device->parent->power.state : ACPI_STATE_D0;

		*state = parent ? parent->power.state : ACPI_STATE_D0;

		goto out;

	}
@@ -122,10 +124,10 @@ int acpi_device_get_power(struct acpi_device *device, int *state) 
	 * point, the fact that the device is in D0 implies that the parent has

	 * to be in D0 too, except if ignore_parent is set.

	 */

	if (!device->power.flags.ignore_parent && device->parent

	    && device->parent->power.state == ACPI_STATE_UNKNOWN

	    && result == ACPI_STATE_D0)

		device->parent->power.state = ACPI_STATE_D0;

	if (!device->power.flags.ignore_parent && parent &&

	    parent->power.state == ACPI_STATE_UNKNOWN &&

	    result == ACPI_STATE_D0)

		parent->power.state = ACPI_STATE_D0;



	*state = result;
@@ -191,14 +193,18 @@ int acpi_device_set_power(struct acpi_device *device, int state) 
		return -ENODEV;

	}



	if (!device->power.flags.ignore_parent && device->parent &&

	    state < device->parent->power.state) {

	if (!device->power.flags.ignore_parent) {

		struct acpi_device *parent;



		parent = acpi_dev_parent(device);

		if (parent && state < parent->power.state) {

			acpi_handle_debug(device->handle,

					  "Cannot transition to %s for parent in %s\n",

					  acpi_power_state_string(state),

				  acpi_power_state_string(device->parent->power.state));

					  acpi_power_state_string(parent->power.state));

			return -ENODEV;

		}

	}



	/*

	 * Transition Power
@@ -497,7 +503,7 @@ static void acpi_pm_notify_handler(acpi_handle handle, u32 val, void *not_used) 


	acpi_handle_debug(handle, "Wake notify\n");



	adev = acpi_bus_get_acpi_device(handle);

	adev = acpi_get_acpi_dev(handle);

	if (!adev)

		return;
@@ -515,7 +521,7 @@ static void acpi_pm_notify_handler(acpi_handle handle, u32 val, void *not_used) 


	mutex_unlock(&acpi_pm_notifier_lock);



	acpi_bus_put_acpi_device(adev);

	acpi_put_acpi_dev(adev);

}



/**