Skip to content

Commit

Permalink
of/irq: Use of_msi_get_domain instead of open-coded "msi-parent" parsing
Browse files Browse the repository at this point in the history
Now that we have a function that implements the complexity of the
"msi-parent" property parsing, switch to that.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
  • Loading branch information
Marc Zyngier committed Oct 16, 2015
1 parent 48ae34f commit 61c0824
Showing 1 changed file with 11 additions and 20 deletions.
31 changes: 11 additions & 20 deletions drivers/of/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,26 +579,6 @@ void __init of_irq_init(const struct of_device_id *matches)
}
}

/**
* of_msi_configure - Set the msi_domain field of a device
* @dev: device structure to associate with an MSI irq domain
* @np: device node for that device
*/
void of_msi_configure(struct device *dev, struct device_node *np)
{
struct device_node *msi_np;
struct irq_domain *d;

msi_np = of_parse_phandle(np, "msi-parent", 0);
if (!msi_np)
return;

d = irq_find_matching_host(msi_np, DOMAIN_BUS_PLATFORM_MSI);
if (!d)
d = irq_find_host(msi_np);
dev_set_msi_domain(dev, d);
}

/**
* of_msi_map_rid - Map a MSI requester ID for a device.
* @dev: device for which the mapping is to be done.
Expand Down Expand Up @@ -741,3 +721,14 @@ struct irq_domain *of_msi_get_domain(struct device *dev,

return NULL;
}

/**
* of_msi_configure - Set the msi_domain field of a device
* @dev: device structure to associate with an MSI irq domain
* @np: device node for that device
*/
void of_msi_configure(struct device *dev, struct device_node *np)
{
dev_set_msi_domain(dev,
of_msi_get_domain(dev, np, DOMAIN_BUS_PLATFORM_MSI));
}

0 comments on commit 61c0824

Please sign in to comment.