Make the current MSI irq_domain local to ease the split between ICU platform device code and NSR platform device code. Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxx> --- drivers/irqchip/irq-mvebu-icu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c index 3694c0d73c0d..607948870a14 100644 --- a/drivers/irqchip/irq-mvebu-icu.c +++ b/drivers/irqchip/irq-mvebu-icu.c @@ -41,7 +41,6 @@ struct mvebu_icu { struct irq_chip irq_chip; struct regmap *regmap; - struct irq_domain *domain; struct device *dev; atomic_t initialized; }; @@ -218,6 +217,7 @@ static int mvebu_icu_probe(struct platform_device *pdev) struct mvebu_icu *icu; struct device_node *node = pdev->dev.of_node; struct device_node *gicp_dn; + struct irq_domain *irq_domain; struct resource *res; void __iomem *regs; int i; @@ -282,11 +282,11 @@ static int mvebu_icu_probe(struct platform_device *pdev) regmap_write(icu->regmap, ICU_INT_CFG(i), 0); } - icu->domain = + irq_domain = platform_msi_create_device_domain(&pdev->dev, ICU_MAX_IRQS, mvebu_icu_write_msg, &mvebu_icu_domain_ops, icu); - if (!icu->domain) { + if (!irq_domain) { dev_err(&pdev->dev, "Failed to create ICU domain\n"); return -ENOMEM; } -- 2.14.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html