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

Commit c92bdfe8 authored by Hanjun Guo's avatar Hanjun Guo Committed by Lorenzo Pieralisi
Browse files

ACPI/IORT: Rework iort_match_node_callback() return value handling 



The return value handling in iort_match_node_callback() is
too convoluted; update the iort_match_node_callback() return
value handling to make code easier to read.

Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
[lorenzo.pieralisi@arm.com: rewrote commit log]
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tested-by: default avatarMing Lei <ming.lei@canonical.com>
Tested-by: default avatarWei Xu <xuwei5@hisilicon.com>
Tested-by: default avatarSinan Kaya <okaya@codeaurora.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Tomasz Nowicki <tn@semihalf.com>
parent 6cb6bf56

drivers/acpi/arm64/iort.c

+2 −6
Original line number Diff line number Diff line
@@ -253,17 +253,15 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node, 
					    void *context)

{

	struct device *dev = context;

	acpi_status status;

	acpi_status status = AE_NOT_FOUND;



	if (node->type == ACPI_IORT_NODE_NAMED_COMPONENT) {

		struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };

		struct acpi_device *adev = to_acpi_device_node(dev->fwnode);

		struct acpi_iort_named_component *ncomp;



		if (!adev) {

			status = AE_NOT_FOUND;

		if (!adev)

			goto out;

		}



		status = acpi_get_name(adev->handle, ACPI_FULL_PATHNAME, &buf);

		if (ACPI_FAILURE(status)) {
@@ -289,8 +287,6 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node, 
		 */

		status = pci_rc->pci_segment_number == pci_domain_nr(bus) ?

							AE_OK : AE_NOT_FOUND;

	} else {

		status = AE_NOT_FOUND;

	}

out:

	return status;