From mboxrd@z Thu Jan 1 00:00:00 1970 From: kong.kongxinwei@hisilicon.com (Xinwei Kong) Date: Fri, 30 Dec 2016 17:00:34 +0800 Subject: [PATCH v5 08/14] ACPI: ARM64: IORT: rework iort_node_get_id() In-Reply-To: <1482384922-21507-9-git-send-email-guohanjun@huawei.com> References: <1482384922-21507-1-git-send-email-guohanjun@huawei.com> <1482384922-21507-9-git-send-email-guohanjun@huawei.com> Message-ID: <58662232.2010001@hisilicon.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2016/12/22 13:35, Hanjun Guo wrote: > From: Hanjun Guo > > 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 > Cc: Lorenzo Pieralisi > Cc: Marc Zyngier > --- > 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 ab7bae7..bc68d93 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; > } > } Tested-by: Xinwei Kong