forked from Minki/linux
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: Hanjun Guo <hanjun.guo@linaro.org> [lorenzo.pieralisi@arm.com: rewrote commit log] Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Tested-by: Ming Lei <ming.lei@canonical.com> Tested-by: Wei Xu <xuwei5@hisilicon.com> Tested-by: Sinan Kaya <okaya@codeaurora.org> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Tomasz Nowicki <tn@semihalf.com>
This commit is contained in:
parent
6cb6bf56dc
commit
c92bdfe8e7
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user