[PATCH v8 03/15] ACPI: IORT: minor cleanup for iort_match_node_callback()
From: guohanjun@huawei.com (Hanjun Guo)
Date: 2017-01-18 13:03:03
Also in:
linux-acpi, lkml
Subsystem:
acpi, the rest · Maintainers:
"Rafael J. Wysocki", Linus Torvalds
From: Hanjun Guo <redacted> Cleanup iort_match_node_callback() a little bit to reduce some lines of code. Signed-off-by: Hanjun Guo <redacted> Tested-by: Ming Lei <redacted> Tested-by: Wei Xu <xuwei5@hisilicon.com> Tested-by: Sinan Kaya <redacted> Cc: Lorenzo Pieralisi <redacted> Cc: Tomasz Nowicki <redacted> --- drivers/acpi/arm64/iort.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index 15f32bf..208eac9 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c@@ -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;
--
1.7.12.4