Skip to content

Commit affdc0d

Browse files
Jiri Slaby (SUSE)KAGA-KOKO
authored andcommitted
irqchip: Switch to irq_domain_create_*()
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter. Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW). [ tglx: Fix up subject prefix ] Signed-off-by: Jiri Slaby (SUSE) <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Acked-by: Changhuang Liang <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent 7f68126 commit affdc0d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+180
-184
lines changed

drivers/irqchip/exynos-combiner.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static void __init combiner_init(void __iomem *combiner_base,
180180
if (!combiner_data)
181181
return;
182182

183-
combiner_irq_domain = irq_domain_add_linear(np, nr_irq,
183+
combiner_irq_domain = irq_domain_create_linear(of_fwnode_handle(np), nr_irq,
184184
&combiner_irq_domain_ops, combiner_data);
185185
if (WARN_ON(!combiner_irq_domain)) {
186186
pr_warn("%s: irq domain init failed\n", __func__);

drivers/irqchip/irq-al-fic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static int al_fic_register(struct device_node *node,
139139
struct irq_chip_generic *gc;
140140
int ret;
141141

142-
fic->domain = irq_domain_add_linear(node,
142+
fic->domain = irq_domain_create_linear(of_fwnode_handle(node),
143143
NR_FIC_IRQS,
144144
&irq_generic_chip_ops,
145145
fic);

drivers/irqchip/irq-alpine-msi.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,8 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,
205205
return -ENXIO;
206206
}
207207

208-
middle_domain = irq_domain_add_hierarchy(gic_domain, 0, 0, NULL,
209-
&alpine_msix_middle_domain_ops,
210-
priv);
208+
middle_domain = irq_domain_create_hierarchy(gic_domain, 0, 0, NULL,
209+
&alpine_msix_middle_domain_ops, priv);
211210
if (!middle_domain) {
212211
pr_err("Failed to create the MSIX middle domain\n");
213212
return -ENOMEM;

drivers/irqchip/irq-armada-370-xp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,
348348
mpic->msi_doorbell_mask = PCI_MSI_FULL_DOORBELL_MASK;
349349
}
350350

351-
mpic->msi_inner_domain = irq_domain_add_linear(NULL, mpic->msi_doorbell_size,
351+
mpic->msi_inner_domain = irq_domain_create_linear(NULL, mpic->msi_doorbell_size,
352352
&mpic_msi_domain_ops, mpic);
353353
if (!mpic->msi_inner_domain)
354354
return -ENOMEM;
@@ -861,7 +861,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *par
861861
if (!mpic_is_ipi_available(mpic))
862862
nr_irqs = MPIC_PER_CPU_IRQS_NR;
863863

864-
mpic->domain = irq_domain_add_linear(node, nr_irqs, &mpic_irq_ops, mpic);
864+
mpic->domain = irq_domain_create_linear(of_fwnode_handle(node), nr_irqs, &mpic_irq_ops, mpic);
865865
if (!mpic->domain) {
866866
pr_err("%pOF: Unable to add IRQ domain\n", node);
867867
return -ENOMEM;

drivers/irqchip/irq-aspeed-i2c-ic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node,
8282
goto err_iounmap;
8383
}
8484

85-
i2c_ic->irq_domain = irq_domain_add_linear(node, ASPEED_I2C_IC_NUM_BUS,
85+
i2c_ic->irq_domain = irq_domain_create_linear(of_fwnode_handle(node), ASPEED_I2C_IC_NUM_BUS,
8686
&aspeed_i2c_ic_irq_domain_ops,
8787
NULL);
8888
if (!i2c_ic->irq_domain) {

drivers/irqchip/irq-aspeed-intc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static int __init aspeed_intc_ic_of_init(struct device_node *node,
102102
writel(0xffffffff, intc_ic->base + INTC_INT_STATUS_REG);
103103
writel(0x0, intc_ic->base + INTC_INT_ENABLE_REG);
104104

105-
intc_ic->irq_domain = irq_domain_add_linear(node, INTC_IRQS_PER_WORD,
105+
intc_ic->irq_domain = irq_domain_create_linear(of_fwnode_handle(node), INTC_IRQS_PER_WORD,
106106
&aspeed_intc_ic_irq_domain_ops, intc_ic);
107107
if (!intc_ic->irq_domain) {
108108
ret = -ENOMEM;

drivers/irqchip/irq-aspeed-scu-ic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_scu_ic *scu_ic,
165165
goto err;
166166
}
167167

168-
scu_ic->irq_domain = irq_domain_add_linear(node, scu_ic->num_irqs,
168+
scu_ic->irq_domain = irq_domain_create_linear(of_fwnode_handle(node), scu_ic->num_irqs,
169169
&aspeed_scu_ic_domain_ops,
170170
scu_ic);
171171
if (!scu_ic->irq_domain) {

drivers/irqchip/irq-aspeed-vic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ static int __init avic_of_init(struct device_node *node,
211211
set_handle_irq(avic_handle_irq);
212212

213213
/* Register our domain */
214-
vic->dom = irq_domain_add_simple(node, NUM_IRQS, 0,
215-
&avic_dom_ops, vic);
214+
vic->dom = irq_domain_create_simple(of_fwnode_handle(node), NUM_IRQS, 0,
215+
&avic_dom_ops, vic);
216216

217217
return 0;
218218
}

drivers/irqchip/irq-ath79-misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static int __init ath79_misc_intc_of_init(
147147
return -ENOMEM;
148148
}
149149

150-
domain = irq_domain_add_linear(node, ATH79_MISC_IRQ_COUNT,
150+
domain = irq_domain_create_linear(of_fwnode_handle(node), ATH79_MISC_IRQ_COUNT,
151151
&misc_irq_domain_ops, base);
152152
if (!domain) {
153153
pr_err("Failed to add MISC irqdomain\n");
@@ -188,7 +188,7 @@ void __init ath79_misc_irq_init(void __iomem *regs, int irq,
188188
else
189189
ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack;
190190

191-
domain = irq_domain_add_legacy(NULL, ATH79_MISC_IRQ_COUNT,
191+
domain = irq_domain_create_legacy(NULL, ATH79_MISC_IRQ_COUNT,
192192
irq_base, 0, &misc_irq_domain_ops, regs);
193193
if (!domain)
194194
panic("Failed to create MISC irqdomain");

drivers/irqchip/irq-atmel-aic-common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
228228
goto err_iounmap;
229229
}
230230

231-
domain = irq_domain_add_linear(node, nchips * 32, ops, aic);
231+
domain = irq_domain_create_linear(of_fwnode_handle(node), nchips * 32, ops, aic);
232232
if (!domain) {
233233
ret = -ENOMEM;
234234
goto err_free_aic;

0 commit comments

Comments
 (0)