diff mbox

[v5,08/14] ACPI: ARM64: IORT: rework iort_node_get_id()

Message ID 1482384922-21507-9-git-send-email-guohanjun@huawei.com
State New
Headers show

Commit Message

Hanjun Guo Dec. 22, 2016, 5:35 a.m. UTC 
From: Hanjun Guo <hanjun.guo@linaro.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@linaro.org>

Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
---
 drivers/acpi/arm64/iort.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
1.7.12.4

Comments

kongxinwei Dec. 30, 2016, 9 a.m. UTC | #1 
On 2016/12/22 13:35, Hanjun Guo wrote:
> From: Hanjun Guo <hanjun.guo@linaro.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@linaro.org>

> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

> Cc: Marc Zyngier <marc.zyngier@arm.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 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 <kong.kongxinwei@hisilicon.com>
diff mbox

Patch

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