[irqchip: irq/irqchip-next] x86/uv: Use irq_domain_create_hierarchy()
From: irqchip-bot for Johan Hovold
Date: Mon Feb 13 2023 - 14:41:08 EST
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: a14e7fdd43040a2a5da2cc979063b3c958015aa9
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/a14e7fdd43040a2a5da2cc979063b3c958015aa9
Author: Johan Hovold <johan+linaro@xxxxxxxxxx>
AuthorDate: Mon, 13 Feb 2023 11:42:55 +01:00
Committer: Marc Zyngier <maz@xxxxxxxxxx>
CommitterDate: Mon, 13 Feb 2023 19:31:24
x86/uv: Use irq_domain_create_hierarchy()
Use the irq_domain_create_hierarchy() helper to create the hierarchical
domain, which both serves as documentation and avoids poking at
irqdomain internals.
Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
Tested-by: Hsin-Yi Wang <hsinyi@xxxxxxxxxxxx>
Tested-by: Mark-PK Tsai <mark-pk.tsai@xxxxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230213104302.17307-14-johan+linaro@xxxxxxxxxx
---
arch/x86/platform/uv/uv_irq.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/platform/uv/uv_irq.c b/arch/x86/platform/uv/uv_irq.c
index 1a536a1..ee21d6a 100644
--- a/arch/x86/platform/uv/uv_irq.c
+++ b/arch/x86/platform/uv/uv_irq.c
@@ -166,10 +166,9 @@ static struct irq_domain *uv_get_irq_domain(void)
if (!fn)
goto out;
- uv_domain = irq_domain_create_tree(fn, &uv_domain_ops, NULL);
- if (uv_domain)
- uv_domain->parent = x86_vector_domain;
- else
+ uv_domain = irq_domain_create_hierarchy(x86_vector_domain, 0, 0, fn,
+ &uv_domain_ops, NULL);
+ if (!uv_domain)
irq_domain_free_fwnode(fn);
out:
mutex_unlock(&uv_lock);