|
@@ -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;
|