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

Merge branch 'acpi-properties' 

Merge fix and cleanup related to the management of ACPI device
properties for 5.16-rc3.

* acpi-properties:
  ACPI: Make acpi_node_get_parent() local
  ACPI: Get acpi_device's parent from the parent field
parents 935dff30 985e9ece

drivers/acpi/property.c

+5 −9
Original line number Diff line number Diff line
@@ -1084,21 +1084,17 @@ struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode, 
 * Returns parent node of an ACPI device or data firmware node or %NULL if

 * not available.

 */

struct fwnode_handle *acpi_node_get_parent(const struct fwnode_handle *fwnode)

static struct fwnode_handle *

acpi_node_get_parent(const struct fwnode_handle *fwnode)

{

	if (is_acpi_data_node(fwnode)) {

		/* All data nodes have parent pointer so just return that */

		return to_acpi_data_node(fwnode)->parent;

	} else if (is_acpi_device_node(fwnode)) {

		acpi_handle handle, parent_handle;



		handle = to_acpi_device_node(fwnode)->handle;

		if (ACPI_SUCCESS(acpi_get_parent(handle, &parent_handle))) {

			struct acpi_device *adev;

		struct device *dev = to_acpi_device_node(fwnode)->dev.parent;



			if (!acpi_bus_get_device(parent_handle, &adev))

				return acpi_fwnode_handle(adev);

		}

		if (dev)

			return acpi_fwnode_handle(to_acpi_device(dev));

	}



	return NULL;

include/linux/acpi.h

+0 −7
Original line number Diff line number Diff line
@@ -1182,7 +1182,6 @@ int acpi_node_prop_get(const struct fwnode_handle *fwnode, const char *propname, 


struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,

					    struct fwnode_handle *child);

struct fwnode_handle *acpi_node_get_parent(const struct fwnode_handle *fwnode);



struct acpi_probe_entry;

typedef bool (*acpi_probe_entry_validate_subtbl)(struct acpi_subtable_header *,
@@ -1287,12 +1286,6 @@ acpi_get_next_subnode(const struct fwnode_handle *fwnode, 
	return NULL;

}



static inline struct fwnode_handle *

acpi_node_get_parent(const struct fwnode_handle *fwnode)

{

	return NULL;

}



static inline struct fwnode_handle *

acpi_graph_get_next_endpoint(const struct fwnode_handle *fwnode,

			     struct fwnode_handle *prev)