[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1477408169-22217-9-git-send-email-guohanjun@huawei.com>
Date: Tue, 25 Oct 2016 23:09:23 +0800
From: Hanjun Guo <guohanjun@...wei.com>
To: Marc Zyngier <marc.zyngier@....com>,
"Rafael J. Wysocki" <rjw@...ysocki.net>,
Lorenzo Pieralisi <lorenzo.pieralisi@....com>
CC: <linux-acpi@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>,
Thomas Gleixner <tglx@...utronix.de>,
Greg KH <gregkh@...uxfoundation.org>,
Tomasz Nowicki <tn@...ihalf.com>, Ma Jun <majun258@...wei.com>,
Kefeng Wang <wangkefeng.wang@...wei.com>,
"Agustin Vega-Frias" <agustinv@...eaurora.org>,
Sinan Kaya <okaya@...eaurora.org>,
"G Gregory" <graeme.gregory@...aro.org>,
Charles Garcia-Tobin <charles.garcia-tobin@....com>,
<huxinwei@...wei.com>, <yimin@...wei.com>, <linuxarm@...wei.com>,
Hanjun Guo <hanjun.guo@...aro.org>
Subject: [PATCH v3 08/14] ACPI: ARM64: IORT: rework iort_node_get_id()
From: Hanjun Guo <hanjun.guo@...aro.org>
iort_node_get_id() has two output, one is the mapped ids,
the other is the referenced parent node which is returned
from the function.
For now we need a API just return its parent node for
single mapping, so just update this function slightly then
reuse it later.
Signed-off-by: Hanjun Guo <hanjun.guo@...aro.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@....com>
Cc: Marc Zyngier <marc.zyngier@....com>
---
drivers/acpi/arm64/iort.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index 7d543aa..2881108 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -347,7 +347,8 @@ struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
if (map[index].flags & ACPI_IORT_ID_SINGLE_MAPPING) {
if (node->type == ACPI_IORT_NODE_NAMED_COMPONENT ||
node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) {
- *id_out = map[index].output_base;
+ if (id_out)
+ *id_out = map[index].output_base;
return parent;
}
}
--
1.7.12.4
Powered by blists - more mailing lists