Skip to content

Commit

Permalink
irqchip/mvebu-odmi: Use irq_domain_create_hierarchy()
Browse files Browse the repository at this point in the history
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@linaro.org>
Tested-by: Hsin-Yi Wang <hsinyi@chromium.org>
Tested-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230213104302.17307-20-johan+linaro@kernel.org
  • Loading branch information
jhovold authored and Marc Zyngier committed Feb 13, 2023
1 parent 6159c47 commit f743f54
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/irqchip/irq-mvebu-odmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static struct msi_domain_info odmi_msi_domain_info = {
static int __init mvebu_odmi_init(struct device_node *node,
struct device_node *parent)
{
struct irq_domain *inner_domain, *plat_domain;
struct irq_domain *parent_domain, *inner_domain, *plat_domain;
int ret, i;

if (of_property_read_u32(node, "marvell,odmi-frames", &odmis_count))
Expand Down Expand Up @@ -197,16 +197,17 @@ static int __init mvebu_odmi_init(struct device_node *node,
}
}

inner_domain = irq_domain_create_linear(of_node_to_fwnode(node),
odmis_count * NODMIS_PER_FRAME,
&odmi_domain_ops, NULL);
parent_domain = irq_find_host(parent);

inner_domain = irq_domain_create_hierarchy(parent_domain, 0,
odmis_count * NODMIS_PER_FRAME,
of_node_to_fwnode(node),
&odmi_domain_ops, NULL);
if (!inner_domain) {
ret = -ENOMEM;
goto err_unmap;
}

inner_domain->parent = irq_find_host(parent);

plat_domain = platform_msi_create_irq_domain(of_node_to_fwnode(node),
&odmi_msi_domain_info,
inner_domain);
Expand Down

0 comments on commit f743f54

Please sign in to comment.