irqdomain: Cleanups and Documentation
Subsystems (144)
PATCH v2 21/57 irqdomain: irqchip: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)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).
--- drivers/irqchip/exynos-combiner.c | 2 +- drivers/irqchip/irq-al-fic.c | 2 +- drivers/irqchip/irq-alpine-msi.c | 5 ++--- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-aspeed-i2c-ic.c | 2 +- drivers/irqchip/irq-aspeed-intc.c | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 2 +- drivers/irqchip/irq-aspeed-vic.c | 4 ++-- drivers/irqchip/irq-ath79-misc.c | 4 ++-- drivers/irqchip/irq-atmel-aic-common.c | 2 +- drivers/irqchip/irq-bcm2712-mip.c | 4 ++-- drivers/irqchip/irq-bcm2835.c | 2 +- drivers/irqchip/irq-bcm2836.c | 2 +- drivers/irqchip/irq-bcm6345-l1.c | 2 +- drivers/irqchip/irq-bcm7038-l1.c | 2 +- drivers/irqchip/irq-bcm7120-l2.c | 2 +- drivers/irqchip/irq-brcmstb-l2.c | 2 +- drivers/irqchip/irq-clps711x.c | 4 ++-- drivers/irqchip/irq-crossbar.c | 6 ++---- drivers/irqchip/irq-csky-apb-intc.c | 2 +- drivers/irqchip/irq-csky-mpintc.c | 2 +- drivers/irqchip/irq-davinci-cp-intc.c | 6 ++++-- drivers/irqchip/irq-digicolor.c | 2 +- drivers/irqchip/irq-dw-apb-ictl.c | 2 +- drivers/irqchip/irq-ftintc010.c | 5 +++-- drivers/irqchip/irq-goldfish-pic.c | 7 +++---- drivers/irqchip/irq-hip04.c | 6 ++---- drivers/irqchip/irq-i8259.c | 4 ++-- drivers/irqchip/irq-idt3243x.c | 2 +- drivers/irqchip/irq-imgpdc.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 4 ++-- drivers/irqchip/irq-imx-intmux.c | 2 +- drivers/irqchip/irq-imx-irqsteer.c | 2 +- drivers/irqchip/irq-ingenic-tcu.c | 4 ++-- drivers/irqchip/irq-ingenic.c | 4 ++-- drivers/irqchip/irq-jcore-aic.c | 5 ++--- drivers/irqchip/irq-keystone.c | 4 ++-- drivers/irqchip/irq-lpc32xx.c | 4 ++-- drivers/irqchip/irq-ls-extirq.c | 4 ++-- drivers/irqchip/irq-ls-scfg-msi.c | 8 ++++---- drivers/irqchip/irq-ls1x.c | 4 ++-- drivers/irqchip/irq-mchp-eic.c | 5 +++-- drivers/irqchip/irq-mips-cpu.c | 13 +++++-------- drivers/irqchip/irq-mips-gic.c | 15 ++++++++------- drivers/irqchip/irq-mmp.c | 12 ++++++------ drivers/irqchip/irq-mscc-ocelot.c | 4 ++-- drivers/irqchip/irq-mst-intc.c | 4 ++-- drivers/irqchip/irq-mtk-cirq.c | 5 ++--- drivers/irqchip/irq-mtk-sysirq.c | 4 ++-- drivers/irqchip/irq-mvebu-pic.c | 4 ++-- drivers/irqchip/irq-mxs.c | 4 ++-- drivers/irqchip/irq-nvic.c | 2 +- drivers/irqchip/irq-omap-intc.c | 4 ++-- drivers/irqchip/irq-or1k-pic.c | 4 ++-- drivers/irqchip/irq-orion.c | 6 +++--- drivers/irqchip/irq-owl-sirq.c | 4 ++-- drivers/irqchip/irq-pic32-evic.c | 6 +++--- drivers/irqchip/irq-pruss-intc.c | 4 ++-- drivers/irqchip/irq-realtek-rtl.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 6 ++++-- drivers/irqchip/irq-renesas-irqc.c | 4 ++-- drivers/irqchip/irq-renesas-rza1.c | 6 +++--- drivers/irqchip/irq-renesas-rzg2l.c | 6 +++--- drivers/irqchip/irq-renesas-rzv2h.c | 5 +++-- drivers/irqchip/irq-sa11x0.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 4 ++-- drivers/irqchip/irq-sp7021-intc.c | 4 ++-- drivers/irqchip/irq-starfive-jh8100-intc.c | 4 ++-- drivers/irqchip/irq-stm32-exti.c | 4 ++-- drivers/irqchip/irq-stm32mp-exti.c | 7 +++---- drivers/irqchip/irq-sun4i.c | 2 +- drivers/irqchip/irq-sun6i-r.c | 4 ++-- drivers/irqchip/irq-sunxi-nmi.c | 2 +- drivers/irqchip/irq-tb10x.c | 8 ++++---- drivers/irqchip/irq-tegra.c | 5 ++--- drivers/irqchip/irq-ti-sci-inta.c | 6 +++--- drivers/irqchip/irq-ti-sci-intr.c | 5 +++-- drivers/irqchip/irq-ts4800.c | 2 +- drivers/irqchip/irq-versatile-fpga.c | 4 ++-- drivers/irqchip/irq-vf610-mscm-ir.c | 6 +++--- drivers/irqchip/irq-vic.c | 5 +++-- drivers/irqchip/irq-vt8500.c | 2 +- drivers/irqchip/irq-wpcm450-aic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 4 ++-- drivers/irqchip/irq-xtensa-mx.c | 5 ++--- drivers/irqchip/irq-xtensa-pic.c | 4 ++-- drivers/irqchip/irq-zevio.c | 4 ++-- drivers/irqchip/spear-shirq.c | 2 +- 88 files changed, 181 insertions(+), 185 deletions(-)
drivers/irqchip/exynos-combiner.c +1 -1
@@ -180,7 +180,7 @@ static void __init combiner_init(void __iomem *combiner_base,if (!combiner_data)return ; - combiner_irq_domain =irq_domain_add_linear (np, nr_irq, + combiner_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), nr_irq, &combiner_irq_domain_ops, combiner_data);if (WARN_ON (!combiner_irq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
drivers/irqchip/irq-al-fic.c +1 -1
@@ -139,7 +139,7 @@ static int al_fic_register(struct device_node *node,struct irq_chip_generic *gc;int ret; - fic->domain =irq_domain_add_linear (node, + fic->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_FIC_IRQS , &irq_generic_chip_ops, fic);
drivers/irqchip/irq-alpine-msi.c +2 -3
@@ -205,9 +205,8 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENXIO ; } - middle_domain =irq_domain_add_hierarchy (gic_domain,0 ,0 ,NULL , - &alpine_msix_middle_domain_ops, - priv); + middle_domain =irq_domain_create_hierarchy (gic_domain,0 ,0 ,NULL , + &alpine_msix_middle_domain_ops, priv);if (!middle_domain) {pr_err ("Failed to create the MSIX middle domain\n" );return -ENOMEM ;
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -348,7 +348,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node, mpic->msi_doorbell_mask =PCI_MSI_FULL_DOORBELL_MASK ; } - mpic->msi_inner_domain =irq_domain_add_linear (NULL , mpic->msi_doorbell_size, + mpic->msi_inner_domain =irq_domain_create_linear (NULL , mpic->msi_doorbell_size, &mpic_msi_domain_ops, mpic);if (!mpic->msi_inner_domain)return -ENOMEM ;
@@ -861,7 +861,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *parif (!mpic_is_ipi_available (mpic)) nr_irqs =MPIC_PER_CPU_IRQS_NR ; - mpic->domain =irq_domain_add_linear (node, nr_irqs, &mpic_irq_ops, mpic); + mpic->domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, &mpic_irq_ops, mpic);if (!mpic->domain) {pr_err ("%pOF: Unable to add IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-aspeed-i2c-ic.c +1 -1
@@ -82,7 +82,7 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node, goto err_iounmap; } - i2c_ic->irq_domain =irq_domain_add_linear (node,ASPEED_I2C_IC_NUM_BUS , + i2c_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),ASPEED_I2C_IC_NUM_BUS , &aspeed_i2c_ic_irq_domain_ops,NULL );if (!i2c_ic->irq_domain) {
drivers/irqchip/irq-aspeed-intc.c +1 -1
@@ -102,7 +102,7 @@ static int __init aspeed_intc_ic_of_init(struct device_node *node,writel (0xffffffff , intc_ic->base +INTC_INT_STATUS_REG );writel (0x0 , intc_ic->base +INTC_INT_ENABLE_REG ); - intc_ic->irq_domain =irq_domain_add_linear (node,INTC_IRQS_PER_WORD , + intc_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),INTC_IRQS_PER_WORD , &aspeed_intc_ic_irq_domain_ops, intc_ic);if (!intc_ic->irq_domain) { ret = -ENOMEM ;
drivers/irqchip/irq-aspeed-scu-ic.c +1 -1
@@ -165,7 +165,7 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_scu_ic *scu_ic, goto err; } - scu_ic->irq_domain =irq_domain_add_linear (node, scu_ic->num_irqs, + scu_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node), scu_ic->num_irqs, &aspeed_scu_ic_domain_ops, scu_ic);if (!scu_ic->irq_domain) {
drivers/irqchip/irq-aspeed-vic.c +2 -2
@@ -211,8 +211,8 @@ static int __init avic_of_init(struct device_node *node,set_handle_irq (avic_handle_irq);/* Register our domain */ - vic->dom =irq_domain_add_simple (node,NUM_IRQS ,0 , - &avic_dom_ops, vic); + vic->dom =irq_domain_create_simple (of_fwnode_handle (node),NUM_IRQS ,0 , + &avic_dom_ops, vic);return 0 ; }
drivers/irqchip/irq-ath79-misc.c +2 -2
@@ -147,7 +147,7 @@ static int __init ath79_misc_intc_of_init(return -ENOMEM ; } - domain =irq_domain_add_linear (node,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_linear (of_fwnode_handle (node),ATH79_MISC_IRQ_COUNT , &misc_irq_domain_ops, base);if (!domain) {pr_err ("Failed to add MISC irqdomain\n" );
@@ -188,7 +188,7 @@ void __init ath79_misc_irq_init(void __iomem *regs, int irq,else ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack; - domain =irq_domain_add_legacy (NULL ,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_legacy (NULL ,ATH79_MISC_IRQ_COUNT , irq_base,0 , &misc_irq_domain_ops, regs);if (!domain)panic ("Failed to create MISC irqdomain" );
drivers/irqchip/irq-atmel-aic-common.c +1 -1
@@ -228,7 +228,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node, goto err_iounmap; } - domain =irq_domain_add_linear (node, nchips *32 , ops, aic); + domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , ops, aic);if (!domain) { ret = -ENOMEM ; goto err_free_aic;
drivers/irqchip/irq-bcm2712-mip.c +2 -2
@@ -173,8 +173,8 @@ static int mip_init_domains(struct mip_priv *mip, struct device_node *np) {struct irq_domain *middle; - middle =irq_domain_add_hierarchy (mip->parent,0 , mip->num_msis, np, - &mip_middle_domain_ops, mip); + middle =irq_domain_create_hierarchy (mip->parent,0 , mip->num_msis,of_fwnode_handle (np), + &mip_middle_domain_ops, mip);if (!middle)return -ENOMEM ;
drivers/irqchip/irq-bcm2835.c +1 -1
@@ -144,7 +144,7 @@ static int __init armctrl_of_init(struct device_node *node,if (!base)panic ("%pOF: unable to map IC registers\n" , node); - intc.domain =irq_domain_add_linear (node,MAKE_HWIRQ (NR_BANKS ,0 ), + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),MAKE_HWIRQ (NR_BANKS ,0 ), &armctrl_ops,NULL );if (!intc.domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-bcm2836.c +1 -1
@@ -325,7 +325,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node,bcm2835_init_local_timer_frequency (); - intc.domain =irq_domain_add_linear (node,LAST_IRQ +1 , + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),LAST_IRQ +1 , &bcm2836_arm_irqchip_intc_ops,NULL );if (!intc.domain)
drivers/irqchip/irq-bcm6345-l1.c +1 -1
@@ -316,7 +316,7 @@ static int __init bcm6345_l1_of_init(struct device_node *dn,raw_spin_lock_init (&intc->lock); - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm6345_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7038-l1.c +1 -1
@@ -416,7 +416,7 @@ static int __init bcm7038_l1_of_init(struct device_node *dn, } } - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm7038_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7120-l2.c +1 -1
@@ -264,7 +264,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, goto out_free_l1_data; } - data->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * data->n_words, + data->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * data->n_words, &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-brcmstb-l2.c +1 -1
@@ -182,7 +182,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, goto out_unmap; } - data->domain =irq_domain_add_linear (np,32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-clps711x.c +2 -2
@@ -184,8 +184,8 @@ static int __init _clps711x_intc_init(struct device_node *np, clps711x_intc->ops.map = clps711x_intc_irq_map; clps711x_intc->ops.xlate = irq_domain_xlate_onecell; clps711x_intc->domain = -irq_domain_add_legacy (np,ARRAY_SIZE (clps711x_irqs), -0 ,0 , &clps711x_intc->ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (np),ARRAY_SIZE (clps711x_irqs),0 ,0 , + &clps711x_intc->ops,NULL );if (!clps711x_intc->domain) { err = -ENOMEM ; goto out_irqfree;
drivers/irqchip/irq-crossbar.c +2 -4
@@ -351,10 +351,8 @@ static int __init irqcrossbar_init(struct device_node *node,if (err)return err; - domain =irq_domain_add_hierarchy (parent_domain,0 , - cb->max_crossbar_sources, - node, &crossbar_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 , cb->max_crossbar_sources, +of_fwnode_handle (node), &crossbar_domain_ops,NULL );if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-csky-apb-intc.c +1 -1
@@ -114,7 +114,7 @@ ck_intc_init_comm(struct device_node *node, struct device_node *parent)return -EINVAL ; } - root_domain =irq_domain_add_linear (node, nr_irq, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &irq_generic_chip_ops,NULL );if (!root_domain) {pr_err ("C-SKY Intc irq_domain_add failed.\n" );
drivers/irqchip/irq-csky-mpintc.c +1 -1
@@ -255,7 +255,7 @@ csky_mpintc_init(struct device_node *node, struct device_node *parent)writel_relaxed (BIT (0 ), INTCG_base +INTCG_ICTLR ); } - root_domain =irq_domain_add_linear (node, nr_irq, &csky_irqdomain_ops, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &csky_irqdomain_ops,NULL );if (!root_domain)return -ENXIO ;
drivers/irqchip/irq-davinci-cp-intc.c +4 -2
@@ -204,8 +204,10 @@ static int __init davinci_cp_intc_do_init(struct resource *res, unsigned int numreturn irq_base; } - davinci_cp_intc_irq_domain =irq_domain_add_legacy (node, num_irqs, irq_base,0 , - &davinci_cp_intc_irq_domain_ops,NULL ); + davinci_cp_intc_irq_domain =irq_domain_create_legacy (of_fwnode_handle (node), num_irqs, + irq_base,0 , + &davinci_cp_intc_irq_domain_ops, +NULL );if (!davinci_cp_intc_irq_domain) {pr_err ("%s: unable to create an interrupt domain\n" , __func__);
drivers/irqchip/irq-digicolor.c +1 -1
@@ -95,7 +95,7 @@ static int __init digicolor_of_init(struct device_node *node,regmap_write (ucregs,UC_IRQ_CONTROL ,1 ); digicolor_irq_domain = -irq_domain_add_linear (node,64 , &irq_generic_chip_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node),64 , &irq_generic_chip_ops,NULL );if (!digicolor_irq_domain) {pr_err ("%pOF: unable to create IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-dw-apb-ictl.c +1 -1
@@ -173,7 +173,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,else nrirqs =fls (readl_relaxed (iobase +APB_INT_ENABLE_L )); - domain =irq_domain_add_linear (np, nrirqs, domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, domain_ops,NULL );if (!domain) {pr_err ("%pOF: unable to add irq domain\n" , np); ret = -ENOMEM ;
drivers/irqchip/irq-ftintc010.c +3 -2
@@ -180,8 +180,9 @@ static int __init ft010_of_init_irq(struct device_node *node,writel (0 ,FT010_IRQ_MASK (f->base));writel (0 ,FT010_FIQ_MASK (f->base)); - f->domain =irq_domain_add_simple (node,FT010_NUM_IRQS ,0 , - &ft010_irqdomain_ops, f); + f->domain =irq_domain_create_simple (of_fwnode_handle (node), +FT010_NUM_IRQS ,0 , + &ft010_irqdomain_ops, f);set_handle_irq (ft010_irqchip_handle_irq);return 0 ;
drivers/irqchip/irq-goldfish-pic.c +3 -4
@@ -101,10 +101,9 @@ static int __init goldfish_pic_of_init(struct device_node *of_node,irq_setup_generic_chip (gc,IRQ_MSK (GFPIC_NR_IRQS ),0 ,IRQ_NOPROBE |IRQ_LEVEL ,0 ); - gfpic->irq_domain =irq_domain_add_legacy (of_node,GFPIC_NR_IRQS , -GFPIC_IRQ_BASE ,0 , - &goldfish_irq_domain_ops, -NULL ); + gfpic->irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),GFPIC_NR_IRQS , +GFPIC_IRQ_BASE ,0 , &goldfish_irq_domain_ops, +NULL );if (!gfpic->irq_domain) {pr_err ("Failed to add irqdomain!\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-hip04.c +2 -4
@@ -386,10 +386,8 @@ hip04_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - hip04_data.domain =irq_domain_add_legacy (node, nr_irqs, irq_base, -0 , - &hip04_irq_domain_ops, - &hip04_data); + hip04_data.domain =irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &hip04_irq_domain_ops, &hip04_data);if (WARN_ON (!hip04_data.domain))return -EINVAL ;
drivers/irqchip/irq-i8259.c +2 -2
@@ -313,8 +313,8 @@ struct irq_domain * __init __init_i8259_irqs(struct device_node *node)init_8259A (0 ); - domain =irq_domain_add_legacy (node,16 ,I8259A_IRQ_BASE ,0 , - &i8259A_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (node),16 ,I8259A_IRQ_BASE ,0 , + &i8259A_ops,NULL );if (!domain)panic ("Failed to add i8259 IRQ domain" );
drivers/irqchip/irq-idt3243x.c +1 -1
@@ -72,7 +72,7 @@ static int idt_pic_init(struct device_node *of_node, struct device_node *parent) goto out_unmap_irq; } - domain =irq_domain_add_linear (of_node,IDT_PIC_NR_IRQS , + domain =irq_domain_create_linear (of_fwnode_handle (of_node),IDT_PIC_NR_IRQS , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Failed to add irqdomain!\n" );
drivers/irqchip/irq-imgpdc.c +1 -1
@@ -372,7 +372,7 @@ static int pdc_intc_probe(struct platform_device *pdev) priv->syswake_irq = irq;/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,16 , &irq_generic_chip_ops, + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),16 , &irq_generic_chip_ops, priv);if (unlikely (!priv->domain)) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );
drivers/irqchip/irq-imx-gpcv2.c +2 -2
@@ -240,8 +240,8 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,return -ENOMEM ; } - domain =irq_domain_add_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , - node, &gpcv2_irqchip_data_domain_ops, cd); + domain =irq_domain_create_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , +of_fwnode_handle (node), &gpcv2_irqchip_data_domain_ops, cd);if (!domain) {iounmap (cd->gpc_base);kfree (cd);
drivers/irqchip/irq-imx-intmux.c +1 -1
@@ -254,7 +254,7 @@ static int imx_intmux_probe(struct platform_device *pdev) goto out; } - domain =irq_domain_add_linear (np,32 , &imx_intmux_domain_ops, + domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &imx_intmux_domain_ops, &data->irqchip_data[i]);if (!domain) { ret = -ENOMEM ;
drivers/irqchip/irq-imx-irqsteer.c +1 -1
@@ -212,7 +212,7 @@ static int imx_irqsteer_probe(struct platform_device *pdev)/* steer all IRQs into configured channel */ writel_relaxed (BIT (data->channel), data->regs +CHANCTRL ); - data->domain =irq_domain_add_linear (np, data->reg_num *32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np), data->reg_num *32 , &imx_irqsteer_domain_ops, data);if (!data->domain) {dev_err (&pdev->dev,"failed to create IRQ domain\n" );
drivers/irqchip/irq-ingenic-tcu.c +2 -2
@@ -114,8 +114,8 @@ static int __init ingenic_tcu_irq_init(struct device_node *np, tcu->nb_parent_irqs = irqs; - tcu->domain =irq_domain_add_linear (np,32 , &irq_generic_chip_ops, -NULL ); + tcu->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops, +NULL );if (!tcu->domain) { ret = -ENOMEM ; goto err_free_tcu;
drivers/irqchip/irq-ingenic.c +2 -2
@@ -90,8 +90,8 @@ static int __init ingenic_intc_of_init(struct device_node *node, goto out_unmap_irq; } - domain =irq_domain_add_linear (node, num_chips *32 , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), num_chips *32 , + &irq_generic_chip_ops,NULL );if (!domain) { err = -ENOMEM ; goto out_unmap_base;
drivers/irqchip/irq-jcore-aic.c +2 -3
@@ -107,9 +107,8 @@ static int __init aic_irq_of_init(struct device_node *node,if (ret <0 )return ret; - domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, - &jcore_aic_irqdomain_ops, - &jcore_aic); + domain =irq_domain_create_legacy (of_fwnode_handle (node), dom_sz - min_irq, min_irq, + min_irq, &jcore_aic_irqdomain_ops, &jcore_aic);if (!domain)return -ENOMEM ;
drivers/irqchip/irq-keystone.c +2 -2
@@ -157,8 +157,8 @@ static int keystone_irq_probe(struct platform_device *pdev) kirq->chip.irq_mask = keystone_irq_setmask; kirq->chip.irq_unmask = keystone_irq_unmask; - kirq->irqd =irq_domain_add_linear (np,KEYSTONE_N_IRQ , - &keystone_irq_ops, kirq); + kirq->irqd =irq_domain_create_linear (of_fwnode_handle (np),KEYSTONE_N_IRQ , + &keystone_irq_ops, kirq);if (!kirq->irqd) {dev_err (dev,"IRQ domain registration failed\n" );return -ENODEV ;
drivers/irqchip/irq-lpc32xx.c +2 -2
@@ -210,8 +210,8 @@ static int __init lpc32xx_of_ic_init(struct device_node *node,return -EINVAL ; } - irqc->domain =irq_domain_add_linear (node,NR_LPC32XX_IC_IRQS , - &lpc32xx_irq_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_LPC32XX_IC_IRQS , + &lpc32xx_irq_domain_ops, irqc);if (!irqc->domain) {pr_err ("unable to add irq domain\n" );iounmap (irqc->base);
drivers/irqchip/irq-ls-extirq.c +2 -2
@@ -208,8 +208,8 @@ ls_extirq_of_init(struct device_node *node, struct device_node *parent)of_device_is_compatible (node,"fsl,ls1043a-extirq" );raw_spin_lock_init (&priv->lock); - domain =irq_domain_add_hierarchy (parent_domain,0 , priv->nirq, node, - &extirq_domain_ops, priv); + domain =irq_domain_create_hierarchy (parent_domain,0 , priv->nirq,of_fwnode_handle (node), + &extirq_domain_ops, priv);if (!domain) { ret = -ENOMEM ; goto err_add_hierarchy;
drivers/irqchip/irq-ls-scfg-msi.c +4 -4
@@ -215,10 +215,10 @@ static void ls_scfg_msi_irq_handler(struct irq_desc *desc)static int ls_scfg_msi_domains_init (struct ls_scfg_msi *msi_data) {/* Initialize MSI domain parent */ - msi_data->parent =irq_domain_add_linear (NULL , - msi_data->irqs_num, - &ls_scfg_msi_domain_ops, - msi_data); + msi_data->parent =irq_domain_create_linear (NULL , + msi_data->irqs_num, + &ls_scfg_msi_domain_ops, + msi_data);if (!msi_data->parent) {dev_err (&msi_data->pdev->dev,"failed to create IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ls1x.c +2 -2
@@ -126,8 +126,8 @@ static int __init ls1x_intc_of_init(struct device_node *node, }/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,32 , &irq_generic_chip_ops, -NULL ); + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &irq_generic_chip_ops, +NULL );if (!priv->domain) {pr_err ("ls1x-irq: cannot add IRQ domain\n" ); err = -ENOMEM ;
drivers/irqchip/irq-mchp-eic.c +3 -2
@@ -248,8 +248,9 @@ static int mchp_eic_init(struct device_node *node, struct device_node *parent) eic->irqs[i] = irq.args[1 ]; } - eic->domain =irq_domain_add_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , - node, &mchp_eic_domain_ops, eic); + eic->domain =irq_domain_create_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , +of_fwnode_handle (node), &mchp_eic_domain_ops, + eic);if (!eic->domain) {pr_err ("%pOF: Failed to add domain\n" , node); ret = -ENODEV ;
drivers/irqchip/irq-mips-cpu.c +5 -8
@@ -238,11 +238,9 @@ static void mips_cpu_register_ipi_domain(struct device_node *of_node)struct cpu_ipi_domain_state *ipi_domain_state; ipi_domain_state =kzalloc (sizeof (*ipi_domain_state),GFP_KERNEL ); - ipi_domain =irq_domain_add_hierarchy (irq_domain, -IRQ_DOMAIN_FLAG_IPI_SINGLE , -2 , of_node, - &mips_cpu_ipi_chip_ops, - ipi_domain_state); + ipi_domain =irq_domain_create_hierarchy (irq_domain,IRQ_DOMAIN_FLAG_IPI_SINGLE ,2 , +of_fwnode_handle (of_node), + &mips_cpu_ipi_chip_ops, ipi_domain_state);if (!ipi_domain)panic ("Failed to add MIPS CPU IPI domain" );irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI );
@@ -260,9 +258,8 @@ static void __init __mips_cpu_irq_init(struct device_node *of_node)clear_c0_status (ST0_IM );clear_c0_cause (CAUSEF_IP ); - irq_domain =irq_domain_add_legacy (of_node,8 ,MIPS_CPU_IRQ_BASE ,0 , - &mips_cpu_intc_irq_domain_ops, -NULL ); + irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),8 ,MIPS_CPU_IRQ_BASE ,0 , + &mips_cpu_intc_irq_domain_ops,NULL );if (!irq_domain)panic ("Failed to add irqdomain for MIPS CPU" );
drivers/irqchip/irq-mips-gic.c +8 -7
@@ -841,10 +841,10 @@ static int gic_register_ipi_domain(struct device_node *node)struct irq_domain *gic_ipi_domain;unsigned int v[2 ], num_ipis; - gic_ipi_domain =irq_domain_add_hierarchy (gic_irq_domain, -IRQ_DOMAIN_FLAG_IPI_PER_CPU , -GIC_NUM_LOCAL_INTRS + gic_shared_intrs, - node, &gic_ipi_domain_ops,NULL ); + gic_ipi_domain =irq_domain_create_hierarchy (gic_irq_domain,IRQ_DOMAIN_FLAG_IPI_PER_CPU , +GIC_NUM_LOCAL_INTRS + gic_shared_intrs, +of_fwnode_handle (node), &gic_ipi_domain_ops, +NULL );if (!gic_ipi_domain) {pr_err ("Failed to add IPI domain" );return -ENXIO ;
@@ -963,9 +963,10 @@ static int __init gic_of_init(struct device_node *node, gic_irq_dispatch); } - gic_irq_domain =irq_domain_add_simple (node,GIC_NUM_LOCAL_INTRS + - gic_shared_intrs,0 , - &gic_irq_domain_ops,NULL ); + gic_irq_domain =irq_domain_create_simple (of_fwnode_handle (node), +GIC_NUM_LOCAL_INTRS + + gic_shared_intrs,0 , + &gic_irq_domain_ops,NULL );if (!gic_irq_domain) {pr_err ("Failed to add IRQ domain" );return -ENXIO ;
drivers/irqchip/irq-mmp.c +6 -6
@@ -261,9 +261,9 @@ static int __init mmp_init_bases(struct device_node *node) } icu_data[0 ].virq_base =0 ; - icu_data[0 ].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[0 ]); + icu_data[0 ].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[0 ]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[0 ].domain, irq);if (!ret) {
@@ -391,9 +391,9 @@ static int __init mmp2_mux_of_init(struct device_node *node,return -EINVAL ; icu_data[i].virq_base =0 ; - icu_data[i].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[i]); + icu_data[i].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[i]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[i].domain, irq);if (!ret) {
drivers/irqchip/irq-mscc-ocelot.c +2 -2
@@ -132,8 +132,8 @@ static int __init vcoreiii_irq_init(struct device_node *node,if (!parent_irq)return -EINVAL ; - domain =irq_domain_add_linear (node, p->n_irq, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), p->n_irq, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-mst-intc.c +2 -2
@@ -273,8 +273,8 @@ static int __init mst_intc_of_init(struct device_node *dn,raw_spin_lock_init (&cd->lock); cd->irq_start = irq_start; cd->nr_irqs = irq_end - irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , cd->nr_irqs, dn, - &mst_intc_domain_ops, cd); + domain =irq_domain_create_hierarchy (domain_parent,0 , cd->nr_irqs,of_fwnode_handle (dn), + &mst_intc_domain_ops, cd);if (!domain) {iounmap (cd->base);kfree (cd);
drivers/irqchip/irq-mtk-cirq.c +2 -3
@@ -336,9 +336,8 @@ static int __init mtk_cirq_of_init(struct device_node *node, cirq_data->offsets = match->data; irq_num = cirq_data->ext_irq_end - cirq_data->ext_irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , - irq_num, node, - &cirq_domain_ops, cirq_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , irq_num,of_fwnode_handle (node), + &cirq_domain_ops, cirq_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-mtk-sysirq.c +2 -2
@@ -207,8 +207,8 @@ static int __init mtk_sysirq_of_init(struct device_node *node, chip_data->which_word[i] = word; } - domain =irq_domain_add_hierarchy (domain_parent,0 , intpol_num, node, - &sysirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , intpol_num,of_fwnode_handle (node), + &sysirq_domain_ops, chip_data);if (!domain) { ret = -ENOMEM ; goto out_free_which_word;
drivers/irqchip/irq-mvebu-pic.c +2 -2
@@ -150,8 +150,8 @@ static int mvebu_pic_probe(struct platform_device *pdev)return -EINVAL ; } - pic->domain =irq_domain_add_linear (node,PIC_MAX_IRQS , - &mvebu_pic_domain_ops, pic); + pic->domain =irq_domain_create_linear (of_fwnode_handle (node),PIC_MAX_IRQS , + &mvebu_pic_domain_ops, pic);if (!pic->domain) {dev_err (&pdev->dev,"Failed to allocate irq domain\n" );return -ENOMEM ;
drivers/irqchip/irq-mxs.c +2 -2
@@ -162,8 +162,8 @@ static const struct irq_domain_ops icoll_irq_domain_ops = {static void __init icoll_add_domain (struct device_node *np,int num) { - icoll_domain =irq_domain_add_linear (np, num, - &icoll_irq_domain_ops,NULL ); + icoll_domain =irq_domain_create_linear (of_fwnode_handle (np), num, + &icoll_irq_domain_ops,NULL );if (!icoll_domain)panic ("%pOF: unable to create irq domain" , np);
drivers/irqchip/irq-nvic.c +1 -1
@@ -90,7 +90,7 @@ static int __init nvic_of_init(struct device_node *node, irqs =NVIC_MAX_IRQ ; nvic_irq_domain = -irq_domain_add_linear (node, irqs, &nvic_irq_domain_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node), irqs, &nvic_irq_domain_ops,NULL );if (!nvic_irq_domain) {pr_warn ("Failed to allocate irq domain\n" );
drivers/irqchip/irq-omap-intc.c +2 -2
@@ -248,7 +248,7 @@ static int __init omap_init_irq_of(struct device_node *node)if (WARN_ON (!omap_irq_base))return -ENOMEM ; - domain =irq_domain_add_linear (node, omap_nr_irqs, + domain =irq_domain_create_linear (of_fwnode_handle (node), omap_nr_irqs, &irq_generic_chip_ops,NULL );omap_irq_soft_reset ();
@@ -274,7 +274,7 @@ static int __init omap_init_irq_legacy(u32 base, struct device_node *node) irq_base =0 ; } - domain =irq_domain_add_legacy (node, omap_nr_irqs, irq_base,0 , + domain =irq_domain_create_legacy (of_fwnode_handle (node), omap_nr_irqs, irq_base,0 , &irq_domain_simple_ops,NULL );omap_irq_soft_reset ();
drivers/irqchip/irq-or1k-pic.c +2 -2
@@ -144,8 +144,8 @@ static int __init or1k_pic_init(struct device_node *node,/* Disable all interrupts until explicitly requested */ mtspr (SPR_PICMR , (0UL )); - root_domain =irq_domain_add_linear (node,32 , &or1k_irq_domain_ops, - pic); + root_domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &or1k_irq_domain_ops, + pic);set_handle_irq (or1k_pic_handle_irq);
drivers/irqchip/irq-orion.c +3 -3
@@ -59,7 +59,7 @@ static int __init orion_irq_init(struct device_node *np,/* count number of irq chips by valid reg addresses */ num_chips =of_address_count (np); - orion_irq_domain =irq_domain_add_linear (np, + orion_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), num_chips *ORION_IRQS_PER_CHIP , &irq_generic_chip_ops,NULL );if (!orion_irq_domain)
@@ -146,8 +146,8 @@ static int __init orion_bridge_irq_init(struct device_node *np,/* get optional number of interrupts provided */ of_property_read_u32 (np,"marvell,#interrupts" , &nrirqs); - domain =irq_domain_add_linear (np, nrirqs, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , np);return -ENOMEM ;
drivers/irqchip/irq-owl-sirq.c +2 -2
@@ -323,8 +323,8 @@ static int __init owl_sirq_init(const struct owl_sirq_params *params,owl_sirq_clear_set_extctl (chip_data,0 ,INTC_EXTCTL_CLK_SEL , i); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_SIRQ , node, - &owl_sirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_SIRQ ,of_fwnode_handle (node), + &owl_sirq_domain_ops, chip_data);if (!domain) {pr_err ("%pOF: failed to add domain\n" , node); ret = -ENOMEM ;
drivers/irqchip/irq-pic32-evic.c +3 -3
@@ -227,9 +227,9 @@ static int __init pic32_of_init(struct device_node *node, goto err_iounmap; } - evic_irq_domain =irq_domain_add_linear (node, nchips *32 , - &pic32_irq_domain_ops, - priv); + evic_irq_domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , + &pic32_irq_domain_ops, + priv);if (!evic_irq_domain) { ret = -ENOMEM ; goto err_free_priv;
drivers/irqchip/irq-pruss-intc.c +2 -2
@@ -555,8 +555,8 @@ static int pruss_intc_probe(struct platform_device *pdev)mutex_init (&intc->lock); - intc->domain =irq_domain_add_linear (dev->of_node, max_system_events, - &pruss_intc_irq_domain_ops, intc); + intc->domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), max_system_events, + &pruss_intc_irq_domain_ops, intc);if (!intc->domain)return -ENOMEM ;
drivers/irqchip/irq-realtek-rtl.c +1 -1
@@ -162,7 +162,7 @@ static int __init realtek_rtl_of_init(struct device_node *node, struct device_noelse if (!parent_irq)return -ENODEV ; - domain =irq_domain_add_linear (node,RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL );if (!domain)return -ENOMEM ;
drivers/irqchip/irq-renesas-intc-irqpin.c +4 -2
@@ -513,8 +513,10 @@ static int intc_irqpin_probe(struct platform_device *pdev) irq_chip->irq_set_wake = intc_irqpin_irq_set_wake; irq_chip->flags =IRQCHIP_MASK_ON_SUSPEND ; - p->irq_domain =irq_domain_add_simple (dev->of_node, nirqs,0 , - &intc_irqpin_irq_domain_ops, p); + p->irq_domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node), + nirqs,0 , + &intc_irqpin_irq_domain_ops, + p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-irqc.c +2 -2
@@ -168,8 +168,8 @@ static int irqc_probe(struct platform_device *pdev) p->cpu_int_base = p->iomem +IRQC_INT_CPU_BASE (0 );/* SYS-SPI */ - p->irq_domain =irq_domain_add_linear (dev->of_node, p->number_of_irqs, - &irq_generic_chip_ops, p); + p->irq_domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), p->number_of_irqs, + &irq_generic_chip_ops, p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-rza1.c +3 -3
@@ -231,9 +231,9 @@ static int rza1_irqc_probe(struct platform_device *pdev) priv->chip.irq_set_type = rza1_irqc_set_type; priv->chip.flags =IRQCHIP_MASK_ON_SUSPEND |IRQCHIP_SKIP_SET_WAKE ; - priv->irq_domain =irq_domain_add_hierarchy (parent,0 ,IRQC_NUM_IRQ , - np, &rza1_irqc_domain_ops, - priv); + priv->irq_domain =irq_domain_create_hierarchy (parent,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (np), &rza1_irqc_domain_ops, + priv);if (!priv->irq_domain) {dev_err (dev,"cannot initialize irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-renesas-rzg2l.c +3 -3
@@ -574,9 +574,9 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node *raw_spin_lock_init (&rzg2l_irqc_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , - node, &rzg2l_irqc_domain_ops, - rzg2l_irqc_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (node), &rzg2l_irqc_domain_ops, + rzg2l_irqc_data);if (!irq_domain) {pm_runtime_put (dev);return dev_err_probe (dev, -ENOMEM ,"failed to add irq domain\n" );
drivers/irqchip/irq-renesas-rzv2h.c +3 -2
@@ -514,8 +514,9 @@ static int rzv2h_icu_init_common(struct device_node *node, struct device_node *praw_spin_lock_init (&rzv2h_icu_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , node, - &rzv2h_icu_domain_ops, rzv2h_icu_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , +of_fwnode_handle (node), &rzv2h_icu_domain_ops, + rzv2h_icu_data);if (!irq_domain) {dev_err (&pdev->dev,"failed to add irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-sa11x0.c +1 -1
@@ -162,7 +162,7 @@ void __init sa11x0_init_irq_nodt(int irq_start, resource_size_t io_start)*/ writel_relaxed (1 , iobase +ICCR ); - sa1100_normal_irqdomain =irq_domain_add_simple (NULL , + sa1100_normal_irqdomain =irq_domain_create_simple (NULL ,32 , irq_start, &sa1100_normal_irqdomain_ops,NULL );
drivers/irqchip/irq-sni-exiu.c +2 -2
@@ -253,8 +253,8 @@ static int __init exiu_dt_init(struct device_node *node,if (IS_ERR (data))return PTR_ERR (data); - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_IRQS , node, - &exiu_domain_ops, data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_IRQS ,of_fwnode_handle (node), + &exiu_domain_ops, data);if (!domain) {pr_err ("%pOF: failed to allocate domain\n" , node); goto out_unmap;
drivers/irqchip/irq-sp7021-intc.c +2 -2
@@ -256,8 +256,8 @@ static int __init sp_intc_init_dt(struct device_node *node, struct device_node *writel_relaxed (~0 ,REG_INTR_CLEAR + i *4 ); } - sp_intc.domain =irq_domain_add_linear (node,SP_INTC_NR_IRQS , - &sp_intc_dm_ops, &sp_intc); + sp_intc.domain =irq_domain_create_linear (of_fwnode_handle (node),SP_INTC_NR_IRQS , + &sp_intc_dm_ops, &sp_intc);if (!sp_intc.domain) { ret = -ENOMEM ; goto out_unmap1;
drivers/irqchip/irq-starfive-jh8100-intc.c +2 -2
@@ -158,8 +158,8 @@ static int __init starfive_intc_init(struct device_node *intc,raw_spin_lock_init (&irqc->lock); - irqc->domain =irq_domain_add_linear (intc,STARFIVE_INTC_SRC_IRQ_NUM , - &starfive_intc_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (intc),STARFIVE_INTC_SRC_IRQ_NUM , + &starfive_intc_domain_ops, irqc);if (!irqc->domain) {pr_err ("Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-stm32-exti.c +2 -2
@@ -344,8 +344,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data,if (!host_data)return -ENOMEM ; - domain =irq_domain_add_linear (node, drv_data->bank_nr *IRQS_PER_BANK , - &irq_exti_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), drv_data->bank_nr *IRQS_PER_BANK , + &irq_exti_domain_ops,NULL );if (!domain) {pr_err ("%pOFn: Could not register interrupt domain.\n" , node);
drivers/irqchip/irq-stm32mp-exti.c +3 -4
@@ -682,10 +682,9 @@ static int stm32mp_exti_probe(struct platform_device *pdev)return -EINVAL ; } - domain =irq_domain_add_hierarchy (parent_domain,0 , - drv_data->bank_nr *IRQS_PER_BANK , - np, &stm32mp_exti_domain_ops, - host_data); + domain =irq_domain_create_hierarchy (parent_domain,0 , drv_data->bank_nr *IRQS_PER_BANK , +of_fwnode_handle (np), &stm32mp_exti_domain_ops, + host_data);if (!domain) {dev_err (dev,"Could not register exti domain\n" );
drivers/irqchip/irq-sun4i.c +1 -1
@@ -133,7 +133,7 @@ static int __init sun4i_of_init(struct device_node *node,/* Configure the external interrupt source type */ writel (0x00 , irq_ic_data->irq_base +SUN4I_IRQ_NMI_CTRL_REG ); - irq_ic_data->irq_domain =irq_domain_add_linear (node,3 *32 , + irq_ic_data->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),3 *32 , &sun4i_irq_ops,NULL );if (!irq_ic_data->irq_domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-sun6i-r.c +2 -2
@@ -338,8 +338,8 @@ static int __init sun6i_r_intc_init(struct device_node *node,return PTR_ERR (base); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 , node, - &sun6i_r_intc_domain_ops,NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 ,of_fwnode_handle (node), + &sun6i_r_intc_domain_ops,NULL );if (!domain) {pr_err ("%pOF: Failed to allocate domain\n" , node);iounmap (base);
drivers/irqchip/irq-sunxi-nmi.c +1 -1
@@ -159,7 +159,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,struct irq_domain *domain;int ret; - domain =irq_domain_add_linear (node,1 , &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),1 , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Could not register interrupt domain.\n" );return -ENOMEM ;
drivers/irqchip/irq-tb10x.c +4 -4
@@ -121,13 +121,13 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, goto ioremap_fail; } - domain =irq_domain_add_linear (ictl,AB_IRQCTL_MAXIRQ , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (ictl),AB_IRQCTL_MAXIRQ , + &irq_generic_chip_ops,NULL );if (!domain) { ret = -ENOMEM ;pr_err ("%pOFn: Could not register interrupt domain.\n" , ictl); - goto irq_domain_add_fail; + goto irq_domain_create_fail; } ret = irq_alloc_domain_generic_chips(domain, AB_IRQCTL_MAXIRQ,
@@ -174,7 +174,7 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, gc_alloc_fail:irq_domain_remove (domain); -irq_domain_add_fail: +irq_domain_create_fail:iounmap (reg_base); ioremap_fail:release_mem_region (mem.start,resource_size (&mem));
drivers/irqchip/irq-tegra.c +2 -3
@@ -330,9 +330,8 @@ static int __init tegra_ictlr_init(struct device_node *node, node, num_ictlrs, soc->num_ictlrs); - domain =irq_domain_add_hierarchy (parent_domain,0 , num_ictlrs *32 , - node, &tegra_ictlr_domain_ops, - lic); + domain =irq_domain_create_hierarchy (parent_domain,0 , num_ictlrs *32 , +of_fwnode_handle (node), &tegra_ictlr_domain_ops, lic);if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node); err = -ENOMEM ;
drivers/irqchip/irq-ti-sci-inta.c +3 -3
@@ -701,9 +701,9 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)if (ret)return ret; - domain =irq_domain_add_linear (dev_of_node (dev), -ti_sci_get_num_resources (inta->vint), - &ti_sci_inta_irq_domain_ops, inta); + domain =irq_domain_create_linear (of_fwnode_handle (dev_of_node (dev)), +ti_sci_get_num_resources (inta->vint), + &ti_sci_inta_irq_domain_ops, inta);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ti-sci-intr.c +3 -2
@@ -274,8 +274,9 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)return PTR_ERR (intr->out_irqs); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 ,dev_of_node (dev), - &ti_sci_intr_irq_domain_ops, intr); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 , +of_fwnode_handle (dev_of_node (dev)), + &ti_sci_intr_irq_domain_ops, intr);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ts4800.c +1 -1
@@ -125,7 +125,7 @@ static int ts4800_ic_probe(struct platform_device *pdev)return -EINVAL ; } - data->domain =irq_domain_add_linear (node,8 , &ts4800_ic_ops, data); + data->domain =irq_domain_create_linear (of_fwnode_handle (node),8 , &ts4800_ic_ops, data);if (!data->domain) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-versatile-fpga.c +2 -2
@@ -176,8 +176,8 @@ static void __init fpga_irq_init(void __iomem *base, int parent_irq, f); } - f->domain =irq_domain_add_linear (node,fls (valid), - &fpga_irqdomain_ops, f); + f->domain =irq_domain_create_linear (of_fwnode_handle (node),fls (valid), + &fpga_irqdomain_ops, f);/* This will allocate all valid descriptors in the linear case */ for (i =0 ; i <fls (valid); i++)
drivers/irqchip/irq-vf610-mscm-ir.c +3 -3
@@ -209,9 +209,9 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node,regmap_read (mscm_cp_regmap, MSCM_CPxNUM, &cpuid); mscm_ir_data->cpu_mask =0x1 << cpuid; - domain =irq_domain_add_hierarchy (domain_parent,0 , -MSCM_IRSPRC_NUM , node, - &mscm_irq_domain_ops, mscm_ir_data); + domain =irq_domain_create_hierarchy (domain_parent,0 ,MSCM_IRSPRC_NUM , +of_fwnode_handle (node), &mscm_irq_domain_ops, + mscm_ir_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-vic.c +3 -2
@@ -289,8 +289,9 @@ static void __init vic_register(void __iomem *base, unsigned int parent_irq, vic_handle_irq_cascaded, v); } - v->domain =irq_domain_add_simple (node,fls (valid_sources), irq, - &vic_irqdomain_ops, v); + v->domain =irq_domain_create_simple (of_fwnode_handle (node), +fls (valid_sources), irq, + &vic_irqdomain_ops, v);/* create an IRQ mapping for each valid IRQ */ for (i =0 ; i <fls (valid_sources); i++)if (valid_sources & (1 << i))
drivers/irqchip/irq-vt8500.c +1 -1
@@ -200,7 +200,7 @@ static int __init vt8500_irq_init(struct device_node *node, } intc[active_cnt].base =of_iomap (np,0 ); - intc[active_cnt].domain =irq_domain_add_linear (node,64 , + intc[active_cnt].domain =irq_domain_create_linear (of_fwnode_handle (node),64 , &vt8500_irq_domain_ops, &intc[active_cnt]);if (!intc[active_cnt].base) {
drivers/irqchip/irq-wpcm450-aic.c +1 -1
@@ -154,7 +154,7 @@ static int __init wpcm450_aic_of_init(struct device_node *node,set_handle_irq (wpcm450_aic_handle_irq); - aic->domain =irq_domain_add_linear (node,AIC_NUM_IRQS , &wpcm450_aic_ops, aic); + aic->domain =irq_domain_create_linear (of_fwnode_handle (node),AIC_NUM_IRQS , &wpcm450_aic_ops, aic);return 0 ; }
drivers/irqchip/irq-xilinx-intc.c +2 -2
@@ -212,8 +212,8 @@ static int __init xilinx_intc_of_init(struct device_node *intc,xintc_write (irqc,MER ,MER_HIE |MER_ME ); } - irqc->root_domain =irq_domain_add_linear (intc, irqc->nr_irq, - &xintc_irq_domain_ops, irqc); + irqc->root_domain =irq_domain_create_linear (of_fwnode_handle (intc), irqc->nr_irq, + &xintc_irq_domain_ops, irqc);if (!irqc->root_domain) {pr_err ("irq-xilinx: Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-xtensa-mx.c +2 -3
@@ -167,8 +167,7 @@ static void __init xtensa_mx_init_common(struct irq_domain *root_domain)int __init xtensa_mx_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , - &xtensa_mx_irq_domain_ops, +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
@@ -178,7 +177,7 @@ static int __init xtensa_mx_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_mx_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
drivers/irqchip/irq-xtensa-pic.c +2 -2
@@ -85,7 +85,7 @@ static struct irq_chip xtensa_irq_chip = {int __init xtensa_pic_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
@@ -95,7 +95,7 @@ static int __init xtensa_pic_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
drivers/irqchip/irq-zevio.c +2 -2
@@ -92,8 +92,8 @@ static int __init zevio_of_init(struct device_node *node,zevio_init_irq_base (zevio_irq_io +IO_IRQ_BASE );zevio_init_irq_base (zevio_irq_io +IO_FIQ_BASE ); - zevio_irq_domain =irq_domain_add_linear (node,MAX_INTRS , - &irq_generic_chip_ops,NULL ); + zevio_irq_domain =irq_domain_create_linear (of_fwnode_handle (node),MAX_INTRS , + &irq_generic_chip_ops,NULL );BUG_ON (!zevio_irq_domain); ret = irq_alloc_domain_generic_chips(zevio_irq_domain, MAX_INTRS, 1,
drivers/irqchip/spear-shirq.c +1 -1
@@ -239,7 +239,7 @@ static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr, goto err_unmap; } - shirq_domain =irq_domain_add_legacy (np, nr_irqs, virq_base,0 , + shirq_domain =irq_domain_create_legacy (of_fwnode_handle (np), nr_irqs, virq_base,0 , &irq_domain_simple_ops,NULL );if (WARN_ON (!shirq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
Signature · 1 line
2.49.0
Re: [PATCH v2 21/57] irqdomain: irqchip: Switch to irq_domain_create_*()
Quoted 6 lines · Jiri Slaby (SUSE)
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_handleinstead of structdevice_node. Therefore,of_fwnode_handle()is added around the original parameter.
Quoted 6 lines
Note some of the users can likely use
dev->fwnodedirectly instead of indirectof_fwnode_handle(dev->of_node). Butdev->fwnodeis 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).Signed-off-by Jiri Slaby (SUSE) <[email protected]>
There are some stray whitespace changes which are distracting, but as things are, there is Documentation/process/4.Coding.rst
saying:
It is natural to fix the style of a piece of code while working on it for other reasons, but coding style changes should not be made for their own sake.
...and you are working on the code for other reasons so I read it like this is actually OK.
(Written mostly to forestall any similar comments.)
Yours,
Linus Walleij
PATCH v2 21/57 irqdomain: irqchip: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)Quoted 6 lines
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_handleinstead of structdevice_node. Therefore,of_fwnode_handle()is added around the original parameter.
Quoted 7 lines
Note some of the users can likely use
dev->fwnodedirectly instead of indirectof_fwnode_handle(dev->of_node). Butdev->fwnodeis 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).Signed-off-by Jiri Slaby (SUSE) <[email protected]>
for starfive-jh8100:
Best Regards,
Changhuang
[tip: irq/cleanups] irqchip: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 35879570b0dd452534bffae6a749bdfb38e53144 Gitweb: https://git.kernel.org/tip/35879570b0dd452534bffae6a749bdfb38e53144 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:14 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:05 +02:00
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 ]
--- drivers/irqchip/exynos-combiner.c | 2 +- drivers/irqchip/irq-al-fic.c | 2 +- drivers/irqchip/irq-alpine-msi.c | 5 ++--- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-aspeed-i2c-ic.c | 2 +- drivers/irqchip/irq-aspeed-intc.c | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 2 +- drivers/irqchip/irq-aspeed-vic.c | 4 ++-- drivers/irqchip/irq-ath79-misc.c | 4 ++-- drivers/irqchip/irq-atmel-aic-common.c | 2 +- drivers/irqchip/irq-bcm2712-mip.c | 4 ++-- drivers/irqchip/irq-bcm2835.c | 2 +- drivers/irqchip/irq-bcm2836.c | 2 +- drivers/irqchip/irq-bcm6345-l1.c | 2 +- drivers/irqchip/irq-bcm7038-l1.c | 2 +- drivers/irqchip/irq-bcm7120-l2.c | 2 +- drivers/irqchip/irq-brcmstb-l2.c | 2 +- drivers/irqchip/irq-clps711x.c | 4 ++-- drivers/irqchip/irq-crossbar.c | 6 ++---- drivers/irqchip/irq-csky-apb-intc.c | 2 +- drivers/irqchip/irq-csky-mpintc.c | 2 +- drivers/irqchip/irq-davinci-cp-intc.c | 6 ++++-- drivers/irqchip/irq-digicolor.c | 2 +- drivers/irqchip/irq-dw-apb-ictl.c | 2 +- drivers/irqchip/irq-ftintc010.c | 5 +++-- drivers/irqchip/irq-goldfish-pic.c | 7 +++---- drivers/irqchip/irq-hip04.c | 6 ++---- drivers/irqchip/irq-i8259.c | 4 ++-- drivers/irqchip/irq-idt3243x.c | 2 +- drivers/irqchip/irq-imgpdc.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 4 ++-- drivers/irqchip/irq-imx-intmux.c | 2 +- drivers/irqchip/irq-imx-irqsteer.c | 2 +- drivers/irqchip/irq-ingenic-tcu.c | 4 ++-- drivers/irqchip/irq-ingenic.c | 4 ++-- drivers/irqchip/irq-jcore-aic.c | 5 ++--- drivers/irqchip/irq-keystone.c | 4 ++-- drivers/irqchip/irq-lpc32xx.c | 4 ++-- drivers/irqchip/irq-ls-extirq.c | 4 ++-- drivers/irqchip/irq-ls-scfg-msi.c | 8 ++++---- drivers/irqchip/irq-ls1x.c | 4 ++-- drivers/irqchip/irq-mchp-eic.c | 5 +++-- drivers/irqchip/irq-mips-cpu.c | 13 +++++-------- drivers/irqchip/irq-mips-gic.c | 15 ++++++++------- drivers/irqchip/irq-mmp.c | 12 ++++++------ drivers/irqchip/irq-mscc-ocelot.c | 4 ++-- drivers/irqchip/irq-mst-intc.c | 4 ++-- drivers/irqchip/irq-mtk-cirq.c | 5 ++--- drivers/irqchip/irq-mtk-sysirq.c | 4 ++-- drivers/irqchip/irq-mvebu-pic.c | 4 ++-- drivers/irqchip/irq-mxs.c | 4 ++-- drivers/irqchip/irq-nvic.c | 2 +- drivers/irqchip/irq-omap-intc.c | 4 ++-- drivers/irqchip/irq-or1k-pic.c | 4 ++-- drivers/irqchip/irq-orion.c | 6 +++--- drivers/irqchip/irq-owl-sirq.c | 4 ++-- drivers/irqchip/irq-pic32-evic.c | 6 +++--- drivers/irqchip/irq-pruss-intc.c | 4 ++-- drivers/irqchip/irq-realtek-rtl.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 6 ++++-- drivers/irqchip/irq-renesas-irqc.c | 4 ++-- drivers/irqchip/irq-renesas-rza1.c | 6 +++--- drivers/irqchip/irq-renesas-rzg2l.c | 6 +++--- drivers/irqchip/irq-renesas-rzv2h.c | 5 +++-- drivers/irqchip/irq-sa11x0.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 4 ++-- drivers/irqchip/irq-sp7021-intc.c | 4 ++-- drivers/irqchip/irq-starfive-jh8100-intc.c | 4 ++-- drivers/irqchip/irq-stm32-exti.c | 4 ++-- drivers/irqchip/irq-stm32mp-exti.c | 7 +++---- drivers/irqchip/irq-sun4i.c | 2 +- drivers/irqchip/irq-sun6i-r.c | 4 ++-- drivers/irqchip/irq-sunxi-nmi.c | 2 +- drivers/irqchip/irq-tb10x.c | 8 ++++---- drivers/irqchip/irq-tegra.c | 5 ++--- drivers/irqchip/irq-ti-sci-inta.c | 6 +++--- drivers/irqchip/irq-ti-sci-intr.c | 5 +++-- drivers/irqchip/irq-ts4800.c | 2 +- drivers/irqchip/irq-versatile-fpga.c | 4 ++-- drivers/irqchip/irq-vf610-mscm-ir.c | 6 +++--- drivers/irqchip/irq-vic.c | 5 +++-- drivers/irqchip/irq-vt8500.c | 2 +- drivers/irqchip/irq-wpcm450-aic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 4 ++-- drivers/irqchip/irq-xtensa-mx.c | 5 ++--- drivers/irqchip/irq-xtensa-pic.c | 4 ++-- drivers/irqchip/irq-zevio.c | 4 ++-- drivers/irqchip/spear-shirq.c | 2 +- 88 files changed, 181 insertions(+), 185 deletions(-)
drivers/irqchip/exynos-combiner.c +1 -1
@@ -180,7 +180,7 @@ static void __init combiner_init(void __iomem *combiner_base,if (!combiner_data)return ; - combiner_irq_domain =irq_domain_add_linear (np, nr_irq, + combiner_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), nr_irq, &combiner_irq_domain_ops, combiner_data);if (WARN_ON (!combiner_irq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
drivers/irqchip/irq-al-fic.c +1 -1
@@ -139,7 +139,7 @@ static int al_fic_register(struct device_node *node,struct irq_chip_generic *gc;int ret; - fic->domain =irq_domain_add_linear (node, + fic->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_FIC_IRQS , &irq_generic_chip_ops, fic);
drivers/irqchip/irq-alpine-msi.c +2 -3
@@ -205,9 +205,8 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENXIO ; } - middle_domain =irq_domain_add_hierarchy (gic_domain,0 ,0 ,NULL , - &alpine_msix_middle_domain_ops, - priv); + middle_domain =irq_domain_create_hierarchy (gic_domain,0 ,0 ,NULL , + &alpine_msix_middle_domain_ops, priv);if (!middle_domain) {pr_err ("Failed to create the MSIX middle domain\n" );return -ENOMEM ;
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -348,7 +348,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node, mpic->msi_doorbell_mask =PCI_MSI_FULL_DOORBELL_MASK ; } - mpic->msi_inner_domain =irq_domain_add_linear (NULL , mpic->msi_doorbell_size, + mpic->msi_inner_domain =irq_domain_create_linear (NULL , mpic->msi_doorbell_size, &mpic_msi_domain_ops, mpic);if (!mpic->msi_inner_domain)return -ENOMEM ;
@@ -861,7 +861,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *parif (!mpic_is_ipi_available (mpic)) nr_irqs =MPIC_PER_CPU_IRQS_NR ; - mpic->domain =irq_domain_add_linear (node, nr_irqs, &mpic_irq_ops, mpic); + mpic->domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, &mpic_irq_ops, mpic);if (!mpic->domain) {pr_err ("%pOF: Unable to add IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-aspeed-i2c-ic.c +1 -1
@@ -82,7 +82,7 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node, goto err_iounmap; } - i2c_ic->irq_domain =irq_domain_add_linear (node,ASPEED_I2C_IC_NUM_BUS , + i2c_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),ASPEED_I2C_IC_NUM_BUS , &aspeed_i2c_ic_irq_domain_ops,NULL );if (!i2c_ic->irq_domain) {
drivers/irqchip/irq-aspeed-intc.c +1 -1
@@ -102,7 +102,7 @@ static int __init aspeed_intc_ic_of_init(struct device_node *node,writel (0xffffffff , intc_ic->base +INTC_INT_STATUS_REG );writel (0x0 , intc_ic->base +INTC_INT_ENABLE_REG ); - intc_ic->irq_domain =irq_domain_add_linear (node,INTC_IRQS_PER_WORD , + intc_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),INTC_IRQS_PER_WORD , &aspeed_intc_ic_irq_domain_ops, intc_ic);if (!intc_ic->irq_domain) { ret = -ENOMEM ;
drivers/irqchip/irq-aspeed-scu-ic.c +1 -1
@@ -165,7 +165,7 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_scu_ic *scu_ic, goto err; } - scu_ic->irq_domain =irq_domain_add_linear (node, scu_ic->num_irqs, + scu_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node), scu_ic->num_irqs, &aspeed_scu_ic_domain_ops, scu_ic);if (!scu_ic->irq_domain) {
drivers/irqchip/irq-aspeed-vic.c +2 -2
@@ -211,8 +211,8 @@ static int __init avic_of_init(struct device_node *node,set_handle_irq (avic_handle_irq);/* Register our domain */ - vic->dom =irq_domain_add_simple (node,NUM_IRQS ,0 , - &avic_dom_ops, vic); + vic->dom =irq_domain_create_simple (of_fwnode_handle (node),NUM_IRQS ,0 , + &avic_dom_ops, vic);return 0 ; }
drivers/irqchip/irq-ath79-misc.c +2 -2
@@ -147,7 +147,7 @@ static int __init ath79_misc_intc_of_init(return -ENOMEM ; } - domain =irq_domain_add_linear (node,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_linear (of_fwnode_handle (node),ATH79_MISC_IRQ_COUNT , &misc_irq_domain_ops, base);if (!domain) {pr_err ("Failed to add MISC irqdomain\n" );
@@ -188,7 +188,7 @@ void __init ath79_misc_irq_init(void __iomem *regs, int irq,else ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack; - domain =irq_domain_add_legacy (NULL ,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_legacy (NULL ,ATH79_MISC_IRQ_COUNT , irq_base,0 , &misc_irq_domain_ops, regs);if (!domain)panic ("Failed to create MISC irqdomain" );
drivers/irqchip/irq-atmel-aic-common.c +1 -1
@@ -228,7 +228,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node, goto err_iounmap; } - domain =irq_domain_add_linear (node, nchips *32 , ops, aic); + domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , ops, aic);if (!domain) { ret = -ENOMEM ; goto err_free_aic;
drivers/irqchip/irq-bcm2712-mip.c +2 -2
@@ -173,8 +173,8 @@ static int mip_init_domains(struct mip_priv *mip, struct device_node *np) {struct irq_domain *middle; - middle =irq_domain_add_hierarchy (mip->parent,0 , mip->num_msis, np, - &mip_middle_domain_ops, mip); + middle =irq_domain_create_hierarchy (mip->parent,0 , mip->num_msis,of_fwnode_handle (np), + &mip_middle_domain_ops, mip);if (!middle)return -ENOMEM ;
drivers/irqchip/irq-bcm2835.c +1 -1
@@ -144,7 +144,7 @@ static int __init armctrl_of_init(struct device_node *node,if (!base)panic ("%pOF: unable to map IC registers\n" , node); - intc.domain =irq_domain_add_linear (node,MAKE_HWIRQ (NR_BANKS ,0 ), + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),MAKE_HWIRQ (NR_BANKS ,0 ), &armctrl_ops,NULL );if (!intc.domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-bcm2836.c +1 -1
@@ -325,7 +325,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node,bcm2835_init_local_timer_frequency (); - intc.domain =irq_domain_add_linear (node,LAST_IRQ +1 , + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),LAST_IRQ +1 , &bcm2836_arm_irqchip_intc_ops,NULL );if (!intc.domain)
drivers/irqchip/irq-bcm6345-l1.c +1 -1
@@ -316,7 +316,7 @@ static int __init bcm6345_l1_of_init(struct device_node *dn,raw_spin_lock_init (&intc->lock); - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm6345_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7038-l1.c +1 -1
@@ -416,7 +416,7 @@ static int __init bcm7038_l1_of_init(struct device_node *dn, } } - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm7038_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7120-l2.c +1 -1
@@ -264,7 +264,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, goto out_free_l1_data; } - data->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * data->n_words, + data->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * data->n_words, &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-brcmstb-l2.c +1 -1
@@ -182,7 +182,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, goto out_unmap; } - data->domain =irq_domain_add_linear (np,32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-clps711x.c +2 -2
@@ -184,8 +184,8 @@ static int __init _clps711x_intc_init(struct device_node *np, clps711x_intc->ops.map = clps711x_intc_irq_map; clps711x_intc->ops.xlate = irq_domain_xlate_onecell; clps711x_intc->domain = -irq_domain_add_legacy (np,ARRAY_SIZE (clps711x_irqs), -0 ,0 , &clps711x_intc->ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (np),ARRAY_SIZE (clps711x_irqs),0 ,0 , + &clps711x_intc->ops,NULL );if (!clps711x_intc->domain) { err = -ENOMEM ; goto out_irqfree;
drivers/irqchip/irq-crossbar.c +2 -4
@@ -351,10 +351,8 @@ static int __init irqcrossbar_init(struct device_node *node,if (err)return err; - domain =irq_domain_add_hierarchy (parent_domain,0 , - cb->max_crossbar_sources, - node, &crossbar_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 , cb->max_crossbar_sources, +of_fwnode_handle (node), &crossbar_domain_ops,NULL );if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-csky-apb-intc.c +1 -1
@@ -114,7 +114,7 @@ ck_intc_init_comm(struct device_node *node, struct device_node *parent)return -EINVAL ; } - root_domain =irq_domain_add_linear (node, nr_irq, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &irq_generic_chip_ops,NULL );if (!root_domain) {pr_err ("C-SKY Intc irq_domain_add failed.\n" );
drivers/irqchip/irq-csky-mpintc.c +1 -1
@@ -255,7 +255,7 @@ csky_mpintc_init(struct device_node *node, struct device_node *parent)writel_relaxed (BIT (0 ), INTCG_base +INTCG_ICTLR ); } - root_domain =irq_domain_add_linear (node, nr_irq, &csky_irqdomain_ops, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &csky_irqdomain_ops,NULL );if (!root_domain)return -ENXIO ;
drivers/irqchip/irq-davinci-cp-intc.c +4 -2
@@ -204,8 +204,10 @@ static int __init davinci_cp_intc_do_init(struct resource *res, unsigned int numreturn irq_base; } - davinci_cp_intc_irq_domain =irq_domain_add_legacy (node, num_irqs, irq_base,0 , - &davinci_cp_intc_irq_domain_ops,NULL ); + davinci_cp_intc_irq_domain =irq_domain_create_legacy (of_fwnode_handle (node), num_irqs, + irq_base,0 , + &davinci_cp_intc_irq_domain_ops, +NULL );if (!davinci_cp_intc_irq_domain) {pr_err ("%s: unable to create an interrupt domain\n" , __func__);
drivers/irqchip/irq-digicolor.c +1 -1
@@ -95,7 +95,7 @@ static int __init digicolor_of_init(struct device_node *node,regmap_write (ucregs,UC_IRQ_CONTROL ,1 ); digicolor_irq_domain = -irq_domain_add_linear (node,64 , &irq_generic_chip_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node),64 , &irq_generic_chip_ops,NULL );if (!digicolor_irq_domain) {pr_err ("%pOF: unable to create IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-dw-apb-ictl.c +1 -1
@@ -173,7 +173,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,else nrirqs =fls (readl_relaxed (iobase +APB_INT_ENABLE_L )); - domain =irq_domain_add_linear (np, nrirqs, domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, domain_ops,NULL );if (!domain) {pr_err ("%pOF: unable to add irq domain\n" , np); ret = -ENOMEM ;
drivers/irqchip/irq-ftintc010.c +3 -2
@@ -180,8 +180,9 @@ static int __init ft010_of_init_irq(struct device_node *node,writel (0 ,FT010_IRQ_MASK (f->base));writel (0 ,FT010_FIQ_MASK (f->base)); - f->domain =irq_domain_add_simple (node,FT010_NUM_IRQS ,0 , - &ft010_irqdomain_ops, f); + f->domain =irq_domain_create_simple (of_fwnode_handle (node), +FT010_NUM_IRQS ,0 , + &ft010_irqdomain_ops, f);set_handle_irq (ft010_irqchip_handle_irq);return 0 ;
drivers/irqchip/irq-goldfish-pic.c +3 -4
@@ -101,10 +101,9 @@ static int __init goldfish_pic_of_init(struct device_node *of_node,irq_setup_generic_chip (gc,IRQ_MSK (GFPIC_NR_IRQS ),0 ,IRQ_NOPROBE |IRQ_LEVEL ,0 ); - gfpic->irq_domain =irq_domain_add_legacy (of_node,GFPIC_NR_IRQS , -GFPIC_IRQ_BASE ,0 , - &goldfish_irq_domain_ops, -NULL ); + gfpic->irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),GFPIC_NR_IRQS , +GFPIC_IRQ_BASE ,0 , &goldfish_irq_domain_ops, +NULL );if (!gfpic->irq_domain) {pr_err ("Failed to add irqdomain!\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-hip04.c +2 -4
@@ -386,10 +386,8 @@ hip04_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - hip04_data.domain =irq_domain_add_legacy (node, nr_irqs, irq_base, -0 , - &hip04_irq_domain_ops, - &hip04_data); + hip04_data.domain =irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &hip04_irq_domain_ops, &hip04_data);if (WARN_ON (!hip04_data.domain))return -EINVAL ;
drivers/irqchip/irq-i8259.c +2 -2
@@ -313,8 +313,8 @@ struct irq_domain * __init __init_i8259_irqs(struct device_node *node)init_8259A (0 ); - domain =irq_domain_add_legacy (node,16 ,I8259A_IRQ_BASE ,0 , - &i8259A_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (node),16 ,I8259A_IRQ_BASE ,0 , + &i8259A_ops,NULL );if (!domain)panic ("Failed to add i8259 IRQ domain" );
drivers/irqchip/irq-idt3243x.c +1 -1
@@ -72,7 +72,7 @@ static int idt_pic_init(struct device_node *of_node, struct device_node *parent) goto out_unmap_irq; } - domain =irq_domain_add_linear (of_node,IDT_PIC_NR_IRQS , + domain =irq_domain_create_linear (of_fwnode_handle (of_node),IDT_PIC_NR_IRQS , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Failed to add irqdomain!\n" );
drivers/irqchip/irq-imgpdc.c +1 -1
@@ -372,7 +372,7 @@ static int pdc_intc_probe(struct platform_device *pdev) priv->syswake_irq = irq;/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,16 , &irq_generic_chip_ops, + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),16 , &irq_generic_chip_ops, priv);if (unlikely (!priv->domain)) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );
drivers/irqchip/irq-imx-gpcv2.c +2 -2
@@ -240,8 +240,8 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,return -ENOMEM ; } - domain =irq_domain_add_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , - node, &gpcv2_irqchip_data_domain_ops, cd); + domain =irq_domain_create_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , +of_fwnode_handle (node), &gpcv2_irqchip_data_domain_ops, cd);if (!domain) {iounmap (cd->gpc_base);kfree (cd);
drivers/irqchip/irq-imx-intmux.c +1 -1
@@ -254,7 +254,7 @@ static int imx_intmux_probe(struct platform_device *pdev) goto out; } - domain =irq_domain_add_linear (np,32 , &imx_intmux_domain_ops, + domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &imx_intmux_domain_ops, &data->irqchip_data[i]);if (!domain) { ret = -ENOMEM ;
drivers/irqchip/irq-imx-irqsteer.c +1 -1
@@ -212,7 +212,7 @@ static int imx_irqsteer_probe(struct platform_device *pdev)/* steer all IRQs into configured channel */ writel_relaxed (BIT (data->channel), data->regs +CHANCTRL ); - data->domain =irq_domain_add_linear (np, data->reg_num *32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np), data->reg_num *32 , &imx_irqsteer_domain_ops, data);if (!data->domain) {dev_err (&pdev->dev,"failed to create IRQ domain\n" );
drivers/irqchip/irq-ingenic-tcu.c +2 -2
@@ -114,8 +114,8 @@ static int __init ingenic_tcu_irq_init(struct device_node *np, tcu->nb_parent_irqs = irqs; - tcu->domain =irq_domain_add_linear (np,32 , &irq_generic_chip_ops, -NULL ); + tcu->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops, +NULL );if (!tcu->domain) { ret = -ENOMEM ; goto err_free_tcu;
drivers/irqchip/irq-ingenic.c +2 -2
@@ -90,8 +90,8 @@ static int __init ingenic_intc_of_init(struct device_node *node, goto out_unmap_irq; } - domain =irq_domain_add_linear (node, num_chips *32 , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), num_chips *32 , + &irq_generic_chip_ops,NULL );if (!domain) { err = -ENOMEM ; goto out_unmap_base;
drivers/irqchip/irq-jcore-aic.c +2 -3
@@ -107,9 +107,8 @@ static int __init aic_irq_of_init(struct device_node *node,if (ret <0 )return ret; - domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, - &jcore_aic_irqdomain_ops, - &jcore_aic); + domain =irq_domain_create_legacy (of_fwnode_handle (node), dom_sz - min_irq, min_irq, + min_irq, &jcore_aic_irqdomain_ops, &jcore_aic);if (!domain)return -ENOMEM ;
drivers/irqchip/irq-keystone.c +2 -2
@@ -157,8 +157,8 @@ static int keystone_irq_probe(struct platform_device *pdev) kirq->chip.irq_mask = keystone_irq_setmask; kirq->chip.irq_unmask = keystone_irq_unmask; - kirq->irqd =irq_domain_add_linear (np,KEYSTONE_N_IRQ , - &keystone_irq_ops, kirq); + kirq->irqd =irq_domain_create_linear (of_fwnode_handle (np),KEYSTONE_N_IRQ , + &keystone_irq_ops, kirq);if (!kirq->irqd) {dev_err (dev,"IRQ domain registration failed\n" );return -ENODEV ;
drivers/irqchip/irq-lpc32xx.c +2 -2
@@ -210,8 +210,8 @@ static int __init lpc32xx_of_ic_init(struct device_node *node,return -EINVAL ; } - irqc->domain =irq_domain_add_linear (node,NR_LPC32XX_IC_IRQS , - &lpc32xx_irq_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_LPC32XX_IC_IRQS , + &lpc32xx_irq_domain_ops, irqc);if (!irqc->domain) {pr_err ("unable to add irq domain\n" );iounmap (irqc->base);
drivers/irqchip/irq-ls-extirq.c +2 -2
@@ -208,8 +208,8 @@ ls_extirq_of_init(struct device_node *node, struct device_node *parent)of_device_is_compatible (node,"fsl,ls1043a-extirq" );raw_spin_lock_init (&priv->lock); - domain =irq_domain_add_hierarchy (parent_domain,0 , priv->nirq, node, - &extirq_domain_ops, priv); + domain =irq_domain_create_hierarchy (parent_domain,0 , priv->nirq,of_fwnode_handle (node), + &extirq_domain_ops, priv);if (!domain) { ret = -ENOMEM ; goto err_add_hierarchy;
drivers/irqchip/irq-ls-scfg-msi.c +4 -4
@@ -215,10 +215,10 @@ static void ls_scfg_msi_irq_handler(struct irq_desc *desc)static int ls_scfg_msi_domains_init (struct ls_scfg_msi *msi_data) {/* Initialize MSI domain parent */ - msi_data->parent =irq_domain_add_linear (NULL , - msi_data->irqs_num, - &ls_scfg_msi_domain_ops, - msi_data); + msi_data->parent =irq_domain_create_linear (NULL , + msi_data->irqs_num, + &ls_scfg_msi_domain_ops, + msi_data);if (!msi_data->parent) {dev_err (&msi_data->pdev->dev,"failed to create IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ls1x.c +2 -2
@@ -126,8 +126,8 @@ static int __init ls1x_intc_of_init(struct device_node *node, }/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,32 , &irq_generic_chip_ops, -NULL ); + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &irq_generic_chip_ops, +NULL );if (!priv->domain) {pr_err ("ls1x-irq: cannot add IRQ domain\n" ); err = -ENOMEM ;
drivers/irqchip/irq-mchp-eic.c +3 -2
@@ -248,8 +248,9 @@ static int mchp_eic_init(struct device_node *node, struct device_node *parent) eic->irqs[i] = irq.args[1 ]; } - eic->domain =irq_domain_add_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , - node, &mchp_eic_domain_ops, eic); + eic->domain =irq_domain_create_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , +of_fwnode_handle (node), &mchp_eic_domain_ops, + eic);if (!eic->domain) {pr_err ("%pOF: Failed to add domain\n" , node); ret = -ENODEV ;
drivers/irqchip/irq-mips-cpu.c +5 -8
@@ -238,11 +238,9 @@ static void mips_cpu_register_ipi_domain(struct device_node *of_node)struct cpu_ipi_domain_state *ipi_domain_state; ipi_domain_state =kzalloc (sizeof (*ipi_domain_state),GFP_KERNEL ); - ipi_domain =irq_domain_add_hierarchy (irq_domain, -IRQ_DOMAIN_FLAG_IPI_SINGLE , -2 , of_node, - &mips_cpu_ipi_chip_ops, - ipi_domain_state); + ipi_domain =irq_domain_create_hierarchy (irq_domain,IRQ_DOMAIN_FLAG_IPI_SINGLE ,2 , +of_fwnode_handle (of_node), + &mips_cpu_ipi_chip_ops, ipi_domain_state);if (!ipi_domain)panic ("Failed to add MIPS CPU IPI domain" );irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI );
@@ -260,9 +258,8 @@ static void __init __mips_cpu_irq_init(struct device_node *of_node)clear_c0_status (ST0_IM );clear_c0_cause (CAUSEF_IP ); - irq_domain =irq_domain_add_legacy (of_node,8 ,MIPS_CPU_IRQ_BASE ,0 , - &mips_cpu_intc_irq_domain_ops, -NULL ); + irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),8 ,MIPS_CPU_IRQ_BASE ,0 , + &mips_cpu_intc_irq_domain_ops,NULL );if (!irq_domain)panic ("Failed to add irqdomain for MIPS CPU" );
drivers/irqchip/irq-mips-gic.c +8 -7
@@ -841,10 +841,10 @@ static int gic_register_ipi_domain(struct device_node *node)struct irq_domain *gic_ipi_domain;unsigned int v[2 ], num_ipis; - gic_ipi_domain =irq_domain_add_hierarchy (gic_irq_domain, -IRQ_DOMAIN_FLAG_IPI_PER_CPU , -GIC_NUM_LOCAL_INTRS + gic_shared_intrs, - node, &gic_ipi_domain_ops,NULL ); + gic_ipi_domain =irq_domain_create_hierarchy (gic_irq_domain,IRQ_DOMAIN_FLAG_IPI_PER_CPU , +GIC_NUM_LOCAL_INTRS + gic_shared_intrs, +of_fwnode_handle (node), &gic_ipi_domain_ops, +NULL );if (!gic_ipi_domain) {pr_err ("Failed to add IPI domain" );return -ENXIO ;
@@ -963,9 +963,10 @@ static int __init gic_of_init(struct device_node *node, gic_irq_dispatch); } - gic_irq_domain =irq_domain_add_simple (node,GIC_NUM_LOCAL_INTRS + - gic_shared_intrs,0 , - &gic_irq_domain_ops,NULL ); + gic_irq_domain =irq_domain_create_simple (of_fwnode_handle (node), +GIC_NUM_LOCAL_INTRS + + gic_shared_intrs,0 , + &gic_irq_domain_ops,NULL );if (!gic_irq_domain) {pr_err ("Failed to add IRQ domain" );return -ENXIO ;
drivers/irqchip/irq-mmp.c +6 -6
@@ -261,9 +261,9 @@ static int __init mmp_init_bases(struct device_node *node) } icu_data[0 ].virq_base =0 ; - icu_data[0 ].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[0 ]); + icu_data[0 ].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[0 ]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[0 ].domain, irq);if (!ret) {
@@ -391,9 +391,9 @@ static int __init mmp2_mux_of_init(struct device_node *node,return -EINVAL ; icu_data[i].virq_base =0 ; - icu_data[i].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[i]); + icu_data[i].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[i]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[i].domain, irq);if (!ret) {
drivers/irqchip/irq-mscc-ocelot.c +2 -2
@@ -132,8 +132,8 @@ static int __init vcoreiii_irq_init(struct device_node *node,if (!parent_irq)return -EINVAL ; - domain =irq_domain_add_linear (node, p->n_irq, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), p->n_irq, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-mst-intc.c +2 -2
@@ -273,8 +273,8 @@ static int __init mst_intc_of_init(struct device_node *dn,raw_spin_lock_init (&cd->lock); cd->irq_start = irq_start; cd->nr_irqs = irq_end - irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , cd->nr_irqs, dn, - &mst_intc_domain_ops, cd); + domain =irq_domain_create_hierarchy (domain_parent,0 , cd->nr_irqs,of_fwnode_handle (dn), + &mst_intc_domain_ops, cd);if (!domain) {iounmap (cd->base);kfree (cd);
drivers/irqchip/irq-mtk-cirq.c +2 -3
@@ -336,9 +336,8 @@ static int __init mtk_cirq_of_init(struct device_node *node, cirq_data->offsets = match->data; irq_num = cirq_data->ext_irq_end - cirq_data->ext_irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , - irq_num, node, - &cirq_domain_ops, cirq_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , irq_num,of_fwnode_handle (node), + &cirq_domain_ops, cirq_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-mtk-sysirq.c +2 -2
@@ -207,8 +207,8 @@ static int __init mtk_sysirq_of_init(struct device_node *node, chip_data->which_word[i] = word; } - domain =irq_domain_add_hierarchy (domain_parent,0 , intpol_num, node, - &sysirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , intpol_num,of_fwnode_handle (node), + &sysirq_domain_ops, chip_data);if (!domain) { ret = -ENOMEM ; goto out_free_which_word;
drivers/irqchip/irq-mvebu-pic.c +2 -2
@@ -150,8 +150,8 @@ static int mvebu_pic_probe(struct platform_device *pdev)return -EINVAL ; } - pic->domain =irq_domain_add_linear (node,PIC_MAX_IRQS , - &mvebu_pic_domain_ops, pic); + pic->domain =irq_domain_create_linear (of_fwnode_handle (node),PIC_MAX_IRQS , + &mvebu_pic_domain_ops, pic);if (!pic->domain) {dev_err (&pdev->dev,"Failed to allocate irq domain\n" );return -ENOMEM ;
drivers/irqchip/irq-mxs.c +2 -2
@@ -162,8 +162,8 @@ static const struct irq_domain_ops icoll_irq_domain_ops = {static void __init icoll_add_domain (struct device_node *np,int num) { - icoll_domain =irq_domain_add_linear (np, num, - &icoll_irq_domain_ops,NULL ); + icoll_domain =irq_domain_create_linear (of_fwnode_handle (np), num, + &icoll_irq_domain_ops,NULL );if (!icoll_domain)panic ("%pOF: unable to create irq domain" , np);
drivers/irqchip/irq-nvic.c +1 -1
@@ -90,7 +90,7 @@ static int __init nvic_of_init(struct device_node *node, irqs =NVIC_MAX_IRQ ; nvic_irq_domain = -irq_domain_add_linear (node, irqs, &nvic_irq_domain_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node), irqs, &nvic_irq_domain_ops,NULL );if (!nvic_irq_domain) {pr_warn ("Failed to allocate irq domain\n" );
drivers/irqchip/irq-omap-intc.c +2 -2
@@ -248,7 +248,7 @@ static int __init omap_init_irq_of(struct device_node *node)if (WARN_ON (!omap_irq_base))return -ENOMEM ; - domain =irq_domain_add_linear (node, omap_nr_irqs, + domain =irq_domain_create_linear (of_fwnode_handle (node), omap_nr_irqs, &irq_generic_chip_ops,NULL );omap_irq_soft_reset ();
@@ -274,7 +274,7 @@ static int __init omap_init_irq_legacy(u32 base, struct device_node *node) irq_base =0 ; } - domain =irq_domain_add_legacy (node, omap_nr_irqs, irq_base,0 , + domain =irq_domain_create_legacy (of_fwnode_handle (node), omap_nr_irqs, irq_base,0 , &irq_domain_simple_ops,NULL );omap_irq_soft_reset ();
drivers/irqchip/irq-or1k-pic.c +2 -2
@@ -144,8 +144,8 @@ static int __init or1k_pic_init(struct device_node *node,/* Disable all interrupts until explicitly requested */ mtspr (SPR_PICMR , (0UL )); - root_domain =irq_domain_add_linear (node,32 , &or1k_irq_domain_ops, - pic); + root_domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &or1k_irq_domain_ops, + pic);set_handle_irq (or1k_pic_handle_irq);
drivers/irqchip/irq-orion.c +3 -3
@@ -59,7 +59,7 @@ static int __init orion_irq_init(struct device_node *np,/* count number of irq chips by valid reg addresses */ num_chips =of_address_count (np); - orion_irq_domain =irq_domain_add_linear (np, + orion_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), num_chips *ORION_IRQS_PER_CHIP , &irq_generic_chip_ops,NULL );if (!orion_irq_domain)
@@ -146,8 +146,8 @@ static int __init orion_bridge_irq_init(struct device_node *np,/* get optional number of interrupts provided */ of_property_read_u32 (np,"marvell,#interrupts" , &nrirqs); - domain =irq_domain_add_linear (np, nrirqs, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , np);return -ENOMEM ;
drivers/irqchip/irq-owl-sirq.c +2 -2
@@ -323,8 +323,8 @@ static int __init owl_sirq_init(const struct owl_sirq_params *params,owl_sirq_clear_set_extctl (chip_data,0 ,INTC_EXTCTL_CLK_SEL , i); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_SIRQ , node, - &owl_sirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_SIRQ ,of_fwnode_handle (node), + &owl_sirq_domain_ops, chip_data);if (!domain) {pr_err ("%pOF: failed to add domain\n" , node); ret = -ENOMEM ;
drivers/irqchip/irq-pic32-evic.c +3 -3
@@ -227,9 +227,9 @@ static int __init pic32_of_init(struct device_node *node, goto err_iounmap; } - evic_irq_domain =irq_domain_add_linear (node, nchips *32 , - &pic32_irq_domain_ops, - priv); + evic_irq_domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , + &pic32_irq_domain_ops, + priv);if (!evic_irq_domain) { ret = -ENOMEM ; goto err_free_priv;
drivers/irqchip/irq-pruss-intc.c +2 -2
@@ -555,8 +555,8 @@ static int pruss_intc_probe(struct platform_device *pdev)mutex_init (&intc->lock); - intc->domain =irq_domain_add_linear (dev->of_node, max_system_events, - &pruss_intc_irq_domain_ops, intc); + intc->domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), max_system_events, + &pruss_intc_irq_domain_ops, intc);if (!intc->domain)return -ENOMEM ;
drivers/irqchip/irq-realtek-rtl.c +1 -1
@@ -162,7 +162,7 @@ static int __init realtek_rtl_of_init(struct device_node *node, struct device_noelse if (!parent_irq)return -ENODEV ; - domain =irq_domain_add_linear (node,RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL );if (!domain)return -ENOMEM ;
drivers/irqchip/irq-renesas-intc-irqpin.c +4 -2
@@ -513,8 +513,10 @@ static int intc_irqpin_probe(struct platform_device *pdev) irq_chip->irq_set_wake = intc_irqpin_irq_set_wake; irq_chip->flags =IRQCHIP_MASK_ON_SUSPEND ; - p->irq_domain =irq_domain_add_simple (dev->of_node, nirqs,0 , - &intc_irqpin_irq_domain_ops, p); + p->irq_domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node), + nirqs,0 , + &intc_irqpin_irq_domain_ops, + p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-irqc.c +2 -2
@@ -168,8 +168,8 @@ static int irqc_probe(struct platform_device *pdev) p->cpu_int_base = p->iomem +IRQC_INT_CPU_BASE (0 );/* SYS-SPI */ - p->irq_domain =irq_domain_add_linear (dev->of_node, p->number_of_irqs, - &irq_generic_chip_ops, p); + p->irq_domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), p->number_of_irqs, + &irq_generic_chip_ops, p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-rza1.c +3 -3
@@ -231,9 +231,9 @@ static int rza1_irqc_probe(struct platform_device *pdev) priv->chip.irq_set_type = rza1_irqc_set_type; priv->chip.flags =IRQCHIP_MASK_ON_SUSPEND |IRQCHIP_SKIP_SET_WAKE ; - priv->irq_domain =irq_domain_add_hierarchy (parent,0 ,IRQC_NUM_IRQ , - np, &rza1_irqc_domain_ops, - priv); + priv->irq_domain =irq_domain_create_hierarchy (parent,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (np), &rza1_irqc_domain_ops, + priv);if (!priv->irq_domain) {dev_err (dev,"cannot initialize irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-renesas-rzg2l.c +3 -3
@@ -574,9 +574,9 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node *raw_spin_lock_init (&rzg2l_irqc_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , - node, &rzg2l_irqc_domain_ops, - rzg2l_irqc_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (node), &rzg2l_irqc_domain_ops, + rzg2l_irqc_data);if (!irq_domain) {pm_runtime_put (dev);return dev_err_probe (dev, -ENOMEM ,"failed to add irq domain\n" );
drivers/irqchip/irq-renesas-rzv2h.c +3 -2
@@ -514,8 +514,9 @@ static int rzv2h_icu_init_common(struct device_node *node, struct device_node *praw_spin_lock_init (&rzv2h_icu_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , node, - &rzv2h_icu_domain_ops, rzv2h_icu_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , +of_fwnode_handle (node), &rzv2h_icu_domain_ops, + rzv2h_icu_data);if (!irq_domain) {dev_err (&pdev->dev,"failed to add irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-sa11x0.c +1 -1
@@ -162,7 +162,7 @@ void __init sa11x0_init_irq_nodt(int irq_start, resource_size_t io_start)*/ writel_relaxed (1 , iobase +ICCR ); - sa1100_normal_irqdomain =irq_domain_add_simple (NULL , + sa1100_normal_irqdomain =irq_domain_create_simple (NULL ,32 , irq_start, &sa1100_normal_irqdomain_ops,NULL );
drivers/irqchip/irq-sni-exiu.c +2 -2
@@ -253,8 +253,8 @@ static int __init exiu_dt_init(struct device_node *node,if (IS_ERR (data))return PTR_ERR (data); - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_IRQS , node, - &exiu_domain_ops, data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_IRQS ,of_fwnode_handle (node), + &exiu_domain_ops, data);if (!domain) {pr_err ("%pOF: failed to allocate domain\n" , node); goto out_unmap;
drivers/irqchip/irq-sp7021-intc.c +2 -2
@@ -256,8 +256,8 @@ static int __init sp_intc_init_dt(struct device_node *node, struct device_node *writel_relaxed (~0 ,REG_INTR_CLEAR + i *4 ); } - sp_intc.domain =irq_domain_add_linear (node,SP_INTC_NR_IRQS , - &sp_intc_dm_ops, &sp_intc); + sp_intc.domain =irq_domain_create_linear (of_fwnode_handle (node),SP_INTC_NR_IRQS , + &sp_intc_dm_ops, &sp_intc);if (!sp_intc.domain) { ret = -ENOMEM ; goto out_unmap1;
drivers/irqchip/irq-starfive-jh8100-intc.c +2 -2
@@ -158,8 +158,8 @@ static int __init starfive_intc_init(struct device_node *intc,raw_spin_lock_init (&irqc->lock); - irqc->domain =irq_domain_add_linear (intc,STARFIVE_INTC_SRC_IRQ_NUM , - &starfive_intc_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (intc),STARFIVE_INTC_SRC_IRQ_NUM , + &starfive_intc_domain_ops, irqc);if (!irqc->domain) {pr_err ("Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-stm32-exti.c +2 -2
@@ -344,8 +344,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data,if (!host_data)return -ENOMEM ; - domain =irq_domain_add_linear (node, drv_data->bank_nr *IRQS_PER_BANK , - &irq_exti_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), drv_data->bank_nr *IRQS_PER_BANK , + &irq_exti_domain_ops,NULL );if (!domain) {pr_err ("%pOFn: Could not register interrupt domain.\n" , node);
drivers/irqchip/irq-stm32mp-exti.c +3 -4
@@ -682,10 +682,9 @@ static int stm32mp_exti_probe(struct platform_device *pdev)return -EINVAL ; } - domain =irq_domain_add_hierarchy (parent_domain,0 , - drv_data->bank_nr *IRQS_PER_BANK , - np, &stm32mp_exti_domain_ops, - host_data); + domain =irq_domain_create_hierarchy (parent_domain,0 , drv_data->bank_nr *IRQS_PER_BANK , +of_fwnode_handle (np), &stm32mp_exti_domain_ops, + host_data);if (!domain) {dev_err (dev,"Could not register exti domain\n" );
drivers/irqchip/irq-sun4i.c +1 -1
@@ -133,7 +133,7 @@ static int __init sun4i_of_init(struct device_node *node,/* Configure the external interrupt source type */ writel (0x00 , irq_ic_data->irq_base +SUN4I_IRQ_NMI_CTRL_REG ); - irq_ic_data->irq_domain =irq_domain_add_linear (node,3 *32 , + irq_ic_data->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),3 *32 , &sun4i_irq_ops,NULL );if (!irq_ic_data->irq_domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-sun6i-r.c +2 -2
@@ -338,8 +338,8 @@ static int __init sun6i_r_intc_init(struct device_node *node,return PTR_ERR (base); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 , node, - &sun6i_r_intc_domain_ops,NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 ,of_fwnode_handle (node), + &sun6i_r_intc_domain_ops,NULL );if (!domain) {pr_err ("%pOF: Failed to allocate domain\n" , node);iounmap (base);
drivers/irqchip/irq-sunxi-nmi.c +1 -1
@@ -159,7 +159,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,struct irq_domain *domain;int ret; - domain =irq_domain_add_linear (node,1 , &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),1 , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Could not register interrupt domain.\n" );return -ENOMEM ;
drivers/irqchip/irq-tb10x.c +4 -4
@@ -121,13 +121,13 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, goto ioremap_fail; } - domain =irq_domain_add_linear (ictl,AB_IRQCTL_MAXIRQ , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (ictl),AB_IRQCTL_MAXIRQ , + &irq_generic_chip_ops,NULL );if (!domain) { ret = -ENOMEM ;pr_err ("%pOFn: Could not register interrupt domain.\n" , ictl); - goto irq_domain_add_fail; + goto irq_domain_create_fail; } ret = irq_alloc_domain_generic_chips(domain, AB_IRQCTL_MAXIRQ,
@@ -174,7 +174,7 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, gc_alloc_fail:irq_domain_remove (domain); -irq_domain_add_fail: +irq_domain_create_fail:iounmap (reg_base); ioremap_fail:release_mem_region (mem.start,resource_size (&mem));
drivers/irqchip/irq-tegra.c +2 -3
@@ -330,9 +330,8 @@ static int __init tegra_ictlr_init(struct device_node *node, node, num_ictlrs, soc->num_ictlrs); - domain =irq_domain_add_hierarchy (parent_domain,0 , num_ictlrs *32 , - node, &tegra_ictlr_domain_ops, - lic); + domain =irq_domain_create_hierarchy (parent_domain,0 , num_ictlrs *32 , +of_fwnode_handle (node), &tegra_ictlr_domain_ops, lic);if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node); err = -ENOMEM ;
drivers/irqchip/irq-ti-sci-inta.c +3 -3
@@ -701,9 +701,9 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)if (ret)return ret; - domain =irq_domain_add_linear (dev_of_node (dev), -ti_sci_get_num_resources (inta->vint), - &ti_sci_inta_irq_domain_ops, inta); + domain =irq_domain_create_linear (of_fwnode_handle (dev_of_node (dev)), +ti_sci_get_num_resources (inta->vint), + &ti_sci_inta_irq_domain_ops, inta);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ti-sci-intr.c +3 -2
@@ -274,8 +274,9 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)return PTR_ERR (intr->out_irqs); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 ,dev_of_node (dev), - &ti_sci_intr_irq_domain_ops, intr); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 , +of_fwnode_handle (dev_of_node (dev)), + &ti_sci_intr_irq_domain_ops, intr);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ts4800.c +1 -1
@@ -125,7 +125,7 @@ static int ts4800_ic_probe(struct platform_device *pdev)return -EINVAL ; } - data->domain =irq_domain_add_linear (node,8 , &ts4800_ic_ops, data); + data->domain =irq_domain_create_linear (of_fwnode_handle (node),8 , &ts4800_ic_ops, data);if (!data->domain) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-versatile-fpga.c +2 -2
@@ -176,8 +176,8 @@ static void __init fpga_irq_init(void __iomem *base, int parent_irq, f); } - f->domain =irq_domain_add_linear (node,fls (valid), - &fpga_irqdomain_ops, f); + f->domain =irq_domain_create_linear (of_fwnode_handle (node),fls (valid), + &fpga_irqdomain_ops, f);/* This will allocate all valid descriptors in the linear case */ for (i =0 ; i <fls (valid); i++)
drivers/irqchip/irq-vf610-mscm-ir.c +3 -3
@@ -209,9 +209,9 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node,regmap_read (mscm_cp_regmap, MSCM_CPxNUM, &cpuid); mscm_ir_data->cpu_mask =0x1 << cpuid; - domain =irq_domain_add_hierarchy (domain_parent,0 , -MSCM_IRSPRC_NUM , node, - &mscm_irq_domain_ops, mscm_ir_data); + domain =irq_domain_create_hierarchy (domain_parent,0 ,MSCM_IRSPRC_NUM , +of_fwnode_handle (node), &mscm_irq_domain_ops, + mscm_ir_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-vic.c +3 -2
@@ -289,8 +289,9 @@ static void __init vic_register(void __iomem *base, unsigned int parent_irq, vic_handle_irq_cascaded, v); } - v->domain =irq_domain_add_simple (node,fls (valid_sources), irq, - &vic_irqdomain_ops, v); + v->domain =irq_domain_create_simple (of_fwnode_handle (node), +fls (valid_sources), irq, + &vic_irqdomain_ops, v);/* create an IRQ mapping for each valid IRQ */ for (i =0 ; i <fls (valid_sources); i++)if (valid_sources & (1 << i))
drivers/irqchip/irq-vt8500.c +1 -1
@@ -200,7 +200,7 @@ static int __init vt8500_irq_init(struct device_node *node, } intc[active_cnt].base =of_iomap (np,0 ); - intc[active_cnt].domain =irq_domain_add_linear (node,64 , + intc[active_cnt].domain =irq_domain_create_linear (of_fwnode_handle (node),64 , &vt8500_irq_domain_ops, &intc[active_cnt]);if (!intc[active_cnt].base) {
drivers/irqchip/irq-wpcm450-aic.c +1 -1
@@ -154,7 +154,7 @@ static int __init wpcm450_aic_of_init(struct device_node *node,set_handle_irq (wpcm450_aic_handle_irq); - aic->domain =irq_domain_add_linear (node,AIC_NUM_IRQS , &wpcm450_aic_ops, aic); + aic->domain =irq_domain_create_linear (of_fwnode_handle (node),AIC_NUM_IRQS , &wpcm450_aic_ops, aic);return 0 ; }
drivers/irqchip/irq-xilinx-intc.c +2 -2
@@ -212,8 +212,8 @@ static int __init xilinx_intc_of_init(struct device_node *intc,xintc_write (irqc,MER ,MER_HIE |MER_ME ); } - irqc->root_domain =irq_domain_add_linear (intc, irqc->nr_irq, - &xintc_irq_domain_ops, irqc); + irqc->root_domain =irq_domain_create_linear (of_fwnode_handle (intc), irqc->nr_irq, + &xintc_irq_domain_ops, irqc);if (!irqc->root_domain) {pr_err ("irq-xilinx: Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-xtensa-mx.c +2 -3
@@ -167,8 +167,7 @@ static void __init xtensa_mx_init_common(struct irq_domain *root_domain)int __init xtensa_mx_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , - &xtensa_mx_irq_domain_ops, +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
@@ -178,7 +177,7 @@ static int __init xtensa_mx_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_mx_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
drivers/irqchip/irq-xtensa-pic.c +2 -2
@@ -85,7 +85,7 @@ static struct irq_chip xtensa_irq_chip = {int __init xtensa_pic_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
@@ -95,7 +95,7 @@ static int __init xtensa_pic_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
drivers/irqchip/irq-zevio.c +2 -2
@@ -92,8 +92,8 @@ static int __init zevio_of_init(struct device_node *node,zevio_init_irq_base (zevio_irq_io +IO_IRQ_BASE );zevio_init_irq_base (zevio_irq_io +IO_FIQ_BASE ); - zevio_irq_domain =irq_domain_add_linear (node,MAX_INTRS , - &irq_generic_chip_ops,NULL ); + zevio_irq_domain =irq_domain_create_linear (of_fwnode_handle (node),MAX_INTRS , + &irq_generic_chip_ops,NULL );BUG_ON (!zevio_irq_domain); ret = irq_alloc_domain_generic_chips(zevio_irq_domain, MAX_INTRS, 1,
drivers/irqchip/spear-shirq.c +1 -1
@@ -239,7 +239,7 @@ static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr, goto err_unmap; } - shirq_domain =irq_domain_add_legacy (np, nr_irqs, virq_base,0 , + shirq_domain =irq_domain_create_legacy (of_fwnode_handle (np), nr_irqs, virq_base,0 , &irq_domain_simple_ops,NULL );if (WARN_ON (!shirq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
[tip: irq/cleanups] irqchip: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 40077b60aa33f2cd8b7926f9bb144e411125e17d Gitweb: https://git.kernel.org/tip/40077b60aa33f2cd8b7926f9bb144e411125e17d Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:14 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
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 ]
--- drivers/irqchip/exynos-combiner.c | 2 +- drivers/irqchip/irq-al-fic.c | 2 +- drivers/irqchip/irq-alpine-msi.c | 5 ++--- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-aspeed-i2c-ic.c | 2 +- drivers/irqchip/irq-aspeed-intc.c | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 2 +- drivers/irqchip/irq-aspeed-vic.c | 4 ++-- drivers/irqchip/irq-ath79-misc.c | 4 ++-- drivers/irqchip/irq-atmel-aic-common.c | 2 +- drivers/irqchip/irq-bcm2712-mip.c | 4 ++-- drivers/irqchip/irq-bcm2835.c | 2 +- drivers/irqchip/irq-bcm2836.c | 2 +- drivers/irqchip/irq-bcm6345-l1.c | 2 +- drivers/irqchip/irq-bcm7038-l1.c | 2 +- drivers/irqchip/irq-bcm7120-l2.c | 2 +- drivers/irqchip/irq-brcmstb-l2.c | 2 +- drivers/irqchip/irq-clps711x.c | 4 ++-- drivers/irqchip/irq-crossbar.c | 6 ++---- drivers/irqchip/irq-csky-apb-intc.c | 2 +- drivers/irqchip/irq-csky-mpintc.c | 2 +- drivers/irqchip/irq-davinci-cp-intc.c | 6 ++++-- drivers/irqchip/irq-digicolor.c | 2 +- drivers/irqchip/irq-dw-apb-ictl.c | 2 +- drivers/irqchip/irq-ftintc010.c | 5 +++-- drivers/irqchip/irq-goldfish-pic.c | 7 +++---- drivers/irqchip/irq-hip04.c | 6 ++---- drivers/irqchip/irq-i8259.c | 4 ++-- drivers/irqchip/irq-idt3243x.c | 2 +- drivers/irqchip/irq-imgpdc.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 4 ++-- drivers/irqchip/irq-imx-intmux.c | 2 +- drivers/irqchip/irq-imx-irqsteer.c | 2 +- drivers/irqchip/irq-ingenic-tcu.c | 4 ++-- drivers/irqchip/irq-ingenic.c | 4 ++-- drivers/irqchip/irq-jcore-aic.c | 5 ++--- drivers/irqchip/irq-keystone.c | 4 ++-- drivers/irqchip/irq-lpc32xx.c | 4 ++-- drivers/irqchip/irq-ls-extirq.c | 4 ++-- drivers/irqchip/irq-ls-scfg-msi.c | 8 ++++---- drivers/irqchip/irq-ls1x.c | 4 ++-- drivers/irqchip/irq-mchp-eic.c | 5 +++-- drivers/irqchip/irq-mips-cpu.c | 13 +++++-------- drivers/irqchip/irq-mips-gic.c | 15 ++++++++------- drivers/irqchip/irq-mmp.c | 12 ++++++------ drivers/irqchip/irq-mscc-ocelot.c | 4 ++-- drivers/irqchip/irq-mst-intc.c | 4 ++-- drivers/irqchip/irq-mtk-cirq.c | 5 ++--- drivers/irqchip/irq-mtk-sysirq.c | 4 ++-- drivers/irqchip/irq-mvebu-pic.c | 4 ++-- drivers/irqchip/irq-mxs.c | 4 ++-- drivers/irqchip/irq-nvic.c | 2 +- drivers/irqchip/irq-omap-intc.c | 4 ++-- drivers/irqchip/irq-or1k-pic.c | 4 ++-- drivers/irqchip/irq-orion.c | 6 +++--- drivers/irqchip/irq-owl-sirq.c | 4 ++-- drivers/irqchip/irq-pic32-evic.c | 6 +++--- drivers/irqchip/irq-pruss-intc.c | 4 ++-- drivers/irqchip/irq-realtek-rtl.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 6 ++++-- drivers/irqchip/irq-renesas-irqc.c | 4 ++-- drivers/irqchip/irq-renesas-rza1.c | 6 +++--- drivers/irqchip/irq-renesas-rzg2l.c | 6 +++--- drivers/irqchip/irq-renesas-rzv2h.c | 5 +++-- drivers/irqchip/irq-sa11x0.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 4 ++-- drivers/irqchip/irq-sp7021-intc.c | 4 ++-- drivers/irqchip/irq-starfive-jh8100-intc.c | 4 ++-- drivers/irqchip/irq-stm32-exti.c | 4 ++-- drivers/irqchip/irq-stm32mp-exti.c | 7 +++---- drivers/irqchip/irq-sun4i.c | 2 +- drivers/irqchip/irq-sun6i-r.c | 4 ++-- drivers/irqchip/irq-sunxi-nmi.c | 2 +- drivers/irqchip/irq-tb10x.c | 8 ++++---- drivers/irqchip/irq-tegra.c | 5 ++--- drivers/irqchip/irq-ti-sci-inta.c | 6 +++--- drivers/irqchip/irq-ti-sci-intr.c | 5 +++-- drivers/irqchip/irq-ts4800.c | 2 +- drivers/irqchip/irq-versatile-fpga.c | 4 ++-- drivers/irqchip/irq-vf610-mscm-ir.c | 6 +++--- drivers/irqchip/irq-vic.c | 5 +++-- drivers/irqchip/irq-vt8500.c | 2 +- drivers/irqchip/irq-wpcm450-aic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 4 ++-- drivers/irqchip/irq-xtensa-mx.c | 5 ++--- drivers/irqchip/irq-xtensa-pic.c | 4 ++-- drivers/irqchip/irq-zevio.c | 4 ++-- drivers/irqchip/spear-shirq.c | 2 +- 88 files changed, 181 insertions(+), 185 deletions(-)
drivers/irqchip/exynos-combiner.c +1 -1
@@ -180,7 +180,7 @@ static void __init combiner_init(void __iomem *combiner_base,if (!combiner_data)return ; - combiner_irq_domain =irq_domain_add_linear (np, nr_irq, + combiner_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), nr_irq, &combiner_irq_domain_ops, combiner_data);if (WARN_ON (!combiner_irq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
drivers/irqchip/irq-al-fic.c +1 -1
@@ -139,7 +139,7 @@ static int al_fic_register(struct device_node *node,struct irq_chip_generic *gc;int ret; - fic->domain =irq_domain_add_linear (node, + fic->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_FIC_IRQS , &irq_generic_chip_ops, fic);
drivers/irqchip/irq-alpine-msi.c +2 -3
@@ -205,9 +205,8 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENXIO ; } - middle_domain =irq_domain_add_hierarchy (gic_domain,0 ,0 ,NULL , - &alpine_msix_middle_domain_ops, - priv); + middle_domain =irq_domain_create_hierarchy (gic_domain,0 ,0 ,NULL , + &alpine_msix_middle_domain_ops, priv);if (!middle_domain) {pr_err ("Failed to create the MSIX middle domain\n" );return -ENOMEM ;
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -348,7 +348,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node, mpic->msi_doorbell_mask =PCI_MSI_FULL_DOORBELL_MASK ; } - mpic->msi_inner_domain =irq_domain_add_linear (NULL , mpic->msi_doorbell_size, + mpic->msi_inner_domain =irq_domain_create_linear (NULL , mpic->msi_doorbell_size, &mpic_msi_domain_ops, mpic);if (!mpic->msi_inner_domain)return -ENOMEM ;
@@ -861,7 +861,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *parif (!mpic_is_ipi_available (mpic)) nr_irqs =MPIC_PER_CPU_IRQS_NR ; - mpic->domain =irq_domain_add_linear (node, nr_irqs, &mpic_irq_ops, mpic); + mpic->domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, &mpic_irq_ops, mpic);if (!mpic->domain) {pr_err ("%pOF: Unable to add IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-aspeed-i2c-ic.c +1 -1
@@ -82,7 +82,7 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node, goto err_iounmap; } - i2c_ic->irq_domain =irq_domain_add_linear (node,ASPEED_I2C_IC_NUM_BUS , + i2c_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),ASPEED_I2C_IC_NUM_BUS , &aspeed_i2c_ic_irq_domain_ops,NULL );if (!i2c_ic->irq_domain) {
drivers/irqchip/irq-aspeed-intc.c +1 -1
@@ -102,7 +102,7 @@ static int __init aspeed_intc_ic_of_init(struct device_node *node,writel (0xffffffff , intc_ic->base +INTC_INT_STATUS_REG );writel (0x0 , intc_ic->base +INTC_INT_ENABLE_REG ); - intc_ic->irq_domain =irq_domain_add_linear (node,INTC_IRQS_PER_WORD , + intc_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),INTC_IRQS_PER_WORD , &aspeed_intc_ic_irq_domain_ops, intc_ic);if (!intc_ic->irq_domain) { ret = -ENOMEM ;
drivers/irqchip/irq-aspeed-scu-ic.c +1 -1
@@ -165,7 +165,7 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_scu_ic *scu_ic, goto err; } - scu_ic->irq_domain =irq_domain_add_linear (node, scu_ic->num_irqs, + scu_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node), scu_ic->num_irqs, &aspeed_scu_ic_domain_ops, scu_ic);if (!scu_ic->irq_domain) {
drivers/irqchip/irq-aspeed-vic.c +2 -2
@@ -211,8 +211,8 @@ static int __init avic_of_init(struct device_node *node,set_handle_irq (avic_handle_irq);/* Register our domain */ - vic->dom =irq_domain_add_simple (node,NUM_IRQS ,0 , - &avic_dom_ops, vic); + vic->dom =irq_domain_create_simple (of_fwnode_handle (node),NUM_IRQS ,0 , + &avic_dom_ops, vic);return 0 ; }
drivers/irqchip/irq-ath79-misc.c +2 -2
@@ -147,7 +147,7 @@ static int __init ath79_misc_intc_of_init(return -ENOMEM ; } - domain =irq_domain_add_linear (node,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_linear (of_fwnode_handle (node),ATH79_MISC_IRQ_COUNT , &misc_irq_domain_ops, base);if (!domain) {pr_err ("Failed to add MISC irqdomain\n" );
@@ -188,7 +188,7 @@ void __init ath79_misc_irq_init(void __iomem *regs, int irq,else ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack; - domain =irq_domain_add_legacy (NULL ,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_legacy (NULL ,ATH79_MISC_IRQ_COUNT , irq_base,0 , &misc_irq_domain_ops, regs);if (!domain)panic ("Failed to create MISC irqdomain" );
drivers/irqchip/irq-atmel-aic-common.c +1 -1
@@ -228,7 +228,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node, goto err_iounmap; } - domain =irq_domain_add_linear (node, nchips *32 , ops, aic); + domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , ops, aic);if (!domain) { ret = -ENOMEM ; goto err_free_aic;
drivers/irqchip/irq-bcm2712-mip.c +2 -2
@@ -173,8 +173,8 @@ static int mip_init_domains(struct mip_priv *mip, struct device_node *np) {struct irq_domain *middle; - middle =irq_domain_add_hierarchy (mip->parent,0 , mip->num_msis, np, - &mip_middle_domain_ops, mip); + middle =irq_domain_create_hierarchy (mip->parent,0 , mip->num_msis,of_fwnode_handle (np), + &mip_middle_domain_ops, mip);if (!middle)return -ENOMEM ;
drivers/irqchip/irq-bcm2835.c +1 -1
@@ -144,7 +144,7 @@ static int __init armctrl_of_init(struct device_node *node,if (!base)panic ("%pOF: unable to map IC registers\n" , node); - intc.domain =irq_domain_add_linear (node,MAKE_HWIRQ (NR_BANKS ,0 ), + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),MAKE_HWIRQ (NR_BANKS ,0 ), &armctrl_ops,NULL );if (!intc.domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-bcm2836.c +1 -1
@@ -325,7 +325,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node,bcm2835_init_local_timer_frequency (); - intc.domain =irq_domain_add_linear (node,LAST_IRQ +1 , + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),LAST_IRQ +1 , &bcm2836_arm_irqchip_intc_ops,NULL );if (!intc.domain)
drivers/irqchip/irq-bcm6345-l1.c +1 -1
@@ -316,7 +316,7 @@ static int __init bcm6345_l1_of_init(struct device_node *dn,raw_spin_lock_init (&intc->lock); - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm6345_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7038-l1.c +1 -1
@@ -416,7 +416,7 @@ static int __init bcm7038_l1_of_init(struct device_node *dn, } } - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm7038_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7120-l2.c +1 -1
@@ -264,7 +264,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, goto out_free_l1_data; } - data->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * data->n_words, + data->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * data->n_words, &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-brcmstb-l2.c +1 -1
@@ -182,7 +182,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, goto out_unmap; } - data->domain =irq_domain_add_linear (np,32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-clps711x.c +2 -2
@@ -184,8 +184,8 @@ static int __init _clps711x_intc_init(struct device_node *np, clps711x_intc->ops.map = clps711x_intc_irq_map; clps711x_intc->ops.xlate = irq_domain_xlate_onecell; clps711x_intc->domain = -irq_domain_add_legacy (np,ARRAY_SIZE (clps711x_irqs), -0 ,0 , &clps711x_intc->ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (np),ARRAY_SIZE (clps711x_irqs),0 ,0 , + &clps711x_intc->ops,NULL );if (!clps711x_intc->domain) { err = -ENOMEM ; goto out_irqfree;
drivers/irqchip/irq-crossbar.c +2 -4
@@ -351,10 +351,8 @@ static int __init irqcrossbar_init(struct device_node *node,if (err)return err; - domain =irq_domain_add_hierarchy (parent_domain,0 , - cb->max_crossbar_sources, - node, &crossbar_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 , cb->max_crossbar_sources, +of_fwnode_handle (node), &crossbar_domain_ops,NULL );if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-csky-apb-intc.c +1 -1
@@ -114,7 +114,7 @@ ck_intc_init_comm(struct device_node *node, struct device_node *parent)return -EINVAL ; } - root_domain =irq_domain_add_linear (node, nr_irq, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &irq_generic_chip_ops,NULL );if (!root_domain) {pr_err ("C-SKY Intc irq_domain_add failed.\n" );
drivers/irqchip/irq-csky-mpintc.c +1 -1
@@ -255,7 +255,7 @@ csky_mpintc_init(struct device_node *node, struct device_node *parent)writel_relaxed (BIT (0 ), INTCG_base +INTCG_ICTLR ); } - root_domain =irq_domain_add_linear (node, nr_irq, &csky_irqdomain_ops, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &csky_irqdomain_ops,NULL );if (!root_domain)return -ENXIO ;
drivers/irqchip/irq-davinci-cp-intc.c +4 -2
@@ -204,8 +204,10 @@ static int __init davinci_cp_intc_do_init(struct resource *res, unsigned int numreturn irq_base; } - davinci_cp_intc_irq_domain =irq_domain_add_legacy (node, num_irqs, irq_base,0 , - &davinci_cp_intc_irq_domain_ops,NULL ); + davinci_cp_intc_irq_domain =irq_domain_create_legacy (of_fwnode_handle (node), num_irqs, + irq_base,0 , + &davinci_cp_intc_irq_domain_ops, +NULL );if (!davinci_cp_intc_irq_domain) {pr_err ("%s: unable to create an interrupt domain\n" , __func__);
drivers/irqchip/irq-digicolor.c +1 -1
@@ -95,7 +95,7 @@ static int __init digicolor_of_init(struct device_node *node,regmap_write (ucregs,UC_IRQ_CONTROL ,1 ); digicolor_irq_domain = -irq_domain_add_linear (node,64 , &irq_generic_chip_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node),64 , &irq_generic_chip_ops,NULL );if (!digicolor_irq_domain) {pr_err ("%pOF: unable to create IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-dw-apb-ictl.c +1 -1
@@ -173,7 +173,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,else nrirqs =fls (readl_relaxed (iobase +APB_INT_ENABLE_L )); - domain =irq_domain_add_linear (np, nrirqs, domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, domain_ops,NULL );if (!domain) {pr_err ("%pOF: unable to add irq domain\n" , np); ret = -ENOMEM ;
drivers/irqchip/irq-ftintc010.c +3 -2
@@ -180,8 +180,9 @@ static int __init ft010_of_init_irq(struct device_node *node,writel (0 ,FT010_IRQ_MASK (f->base));writel (0 ,FT010_FIQ_MASK (f->base)); - f->domain =irq_domain_add_simple (node,FT010_NUM_IRQS ,0 , - &ft010_irqdomain_ops, f); + f->domain =irq_domain_create_simple (of_fwnode_handle (node), +FT010_NUM_IRQS ,0 , + &ft010_irqdomain_ops, f);set_handle_irq (ft010_irqchip_handle_irq);return 0 ;
drivers/irqchip/irq-goldfish-pic.c +3 -4
@@ -101,10 +101,9 @@ static int __init goldfish_pic_of_init(struct device_node *of_node,irq_setup_generic_chip (gc,IRQ_MSK (GFPIC_NR_IRQS ),0 ,IRQ_NOPROBE |IRQ_LEVEL ,0 ); - gfpic->irq_domain =irq_domain_add_legacy (of_node,GFPIC_NR_IRQS , -GFPIC_IRQ_BASE ,0 , - &goldfish_irq_domain_ops, -NULL ); + gfpic->irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),GFPIC_NR_IRQS , +GFPIC_IRQ_BASE ,0 , &goldfish_irq_domain_ops, +NULL );if (!gfpic->irq_domain) {pr_err ("Failed to add irqdomain!\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-hip04.c +2 -4
@@ -386,10 +386,8 @@ hip04_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - hip04_data.domain =irq_domain_add_legacy (node, nr_irqs, irq_base, -0 , - &hip04_irq_domain_ops, - &hip04_data); + hip04_data.domain =irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &hip04_irq_domain_ops, &hip04_data);if (WARN_ON (!hip04_data.domain))return -EINVAL ;
drivers/irqchip/irq-i8259.c +2 -2
@@ -313,8 +313,8 @@ struct irq_domain * __init __init_i8259_irqs(struct device_node *node)init_8259A (0 ); - domain =irq_domain_add_legacy (node,16 ,I8259A_IRQ_BASE ,0 , - &i8259A_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (node),16 ,I8259A_IRQ_BASE ,0 , + &i8259A_ops,NULL );if (!domain)panic ("Failed to add i8259 IRQ domain" );
drivers/irqchip/irq-idt3243x.c +1 -1
@@ -72,7 +72,7 @@ static int idt_pic_init(struct device_node *of_node, struct device_node *parent) goto out_unmap_irq; } - domain =irq_domain_add_linear (of_node,IDT_PIC_NR_IRQS , + domain =irq_domain_create_linear (of_fwnode_handle (of_node),IDT_PIC_NR_IRQS , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Failed to add irqdomain!\n" );
drivers/irqchip/irq-imgpdc.c +1 -1
@@ -372,7 +372,7 @@ static int pdc_intc_probe(struct platform_device *pdev) priv->syswake_irq = irq;/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,16 , &irq_generic_chip_ops, + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),16 , &irq_generic_chip_ops, priv);if (unlikely (!priv->domain)) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );
drivers/irqchip/irq-imx-gpcv2.c +2 -2
@@ -240,8 +240,8 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,return -ENOMEM ; } - domain =irq_domain_add_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , - node, &gpcv2_irqchip_data_domain_ops, cd); + domain =irq_domain_create_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , +of_fwnode_handle (node), &gpcv2_irqchip_data_domain_ops, cd);if (!domain) {iounmap (cd->gpc_base);kfree (cd);
drivers/irqchip/irq-imx-intmux.c +1 -1
@@ -254,7 +254,7 @@ static int imx_intmux_probe(struct platform_device *pdev) goto out; } - domain =irq_domain_add_linear (np,32 , &imx_intmux_domain_ops, + domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &imx_intmux_domain_ops, &data->irqchip_data[i]);if (!domain) { ret = -ENOMEM ;
drivers/irqchip/irq-imx-irqsteer.c +1 -1
@@ -212,7 +212,7 @@ static int imx_irqsteer_probe(struct platform_device *pdev)/* steer all IRQs into configured channel */ writel_relaxed (BIT (data->channel), data->regs +CHANCTRL ); - data->domain =irq_domain_add_linear (np, data->reg_num *32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np), data->reg_num *32 , &imx_irqsteer_domain_ops, data);if (!data->domain) {dev_err (&pdev->dev,"failed to create IRQ domain\n" );
drivers/irqchip/irq-ingenic-tcu.c +2 -2
@@ -114,8 +114,8 @@ static int __init ingenic_tcu_irq_init(struct device_node *np, tcu->nb_parent_irqs = irqs; - tcu->domain =irq_domain_add_linear (np,32 , &irq_generic_chip_ops, -NULL ); + tcu->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops, +NULL );if (!tcu->domain) { ret = -ENOMEM ; goto err_free_tcu;
drivers/irqchip/irq-ingenic.c +2 -2
@@ -90,8 +90,8 @@ static int __init ingenic_intc_of_init(struct device_node *node, goto out_unmap_irq; } - domain =irq_domain_add_linear (node, num_chips *32 , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), num_chips *32 , + &irq_generic_chip_ops,NULL );if (!domain) { err = -ENOMEM ; goto out_unmap_base;
drivers/irqchip/irq-jcore-aic.c +2 -3
@@ -107,9 +107,8 @@ static int __init aic_irq_of_init(struct device_node *node,if (ret <0 )return ret; - domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, - &jcore_aic_irqdomain_ops, - &jcore_aic); + domain =irq_domain_create_legacy (of_fwnode_handle (node), dom_sz - min_irq, min_irq, + min_irq, &jcore_aic_irqdomain_ops, &jcore_aic);if (!domain)return -ENOMEM ;
drivers/irqchip/irq-keystone.c +2 -2
@@ -157,8 +157,8 @@ static int keystone_irq_probe(struct platform_device *pdev) kirq->chip.irq_mask = keystone_irq_setmask; kirq->chip.irq_unmask = keystone_irq_unmask; - kirq->irqd =irq_domain_add_linear (np,KEYSTONE_N_IRQ , - &keystone_irq_ops, kirq); + kirq->irqd =irq_domain_create_linear (of_fwnode_handle (np),KEYSTONE_N_IRQ , + &keystone_irq_ops, kirq);if (!kirq->irqd) {dev_err (dev,"IRQ domain registration failed\n" );return -ENODEV ;
drivers/irqchip/irq-lpc32xx.c +2 -2
@@ -210,8 +210,8 @@ static int __init lpc32xx_of_ic_init(struct device_node *node,return -EINVAL ; } - irqc->domain =irq_domain_add_linear (node,NR_LPC32XX_IC_IRQS , - &lpc32xx_irq_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_LPC32XX_IC_IRQS , + &lpc32xx_irq_domain_ops, irqc);if (!irqc->domain) {pr_err ("unable to add irq domain\n" );iounmap (irqc->base);
drivers/irqchip/irq-ls-extirq.c +2 -2
@@ -208,8 +208,8 @@ ls_extirq_of_init(struct device_node *node, struct device_node *parent)of_device_is_compatible (node,"fsl,ls1043a-extirq" );raw_spin_lock_init (&priv->lock); - domain =irq_domain_add_hierarchy (parent_domain,0 , priv->nirq, node, - &extirq_domain_ops, priv); + domain =irq_domain_create_hierarchy (parent_domain,0 , priv->nirq,of_fwnode_handle (node), + &extirq_domain_ops, priv);if (!domain) { ret = -ENOMEM ; goto err_add_hierarchy;
drivers/irqchip/irq-ls-scfg-msi.c +4 -4
@@ -215,10 +215,10 @@ static void ls_scfg_msi_irq_handler(struct irq_desc *desc)static int ls_scfg_msi_domains_init (struct ls_scfg_msi *msi_data) {/* Initialize MSI domain parent */ - msi_data->parent =irq_domain_add_linear (NULL , - msi_data->irqs_num, - &ls_scfg_msi_domain_ops, - msi_data); + msi_data->parent =irq_domain_create_linear (NULL , + msi_data->irqs_num, + &ls_scfg_msi_domain_ops, + msi_data);if (!msi_data->parent) {dev_err (&msi_data->pdev->dev,"failed to create IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ls1x.c +2 -2
@@ -126,8 +126,8 @@ static int __init ls1x_intc_of_init(struct device_node *node, }/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,32 , &irq_generic_chip_ops, -NULL ); + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &irq_generic_chip_ops, +NULL );if (!priv->domain) {pr_err ("ls1x-irq: cannot add IRQ domain\n" ); err = -ENOMEM ;
drivers/irqchip/irq-mchp-eic.c +3 -2
@@ -248,8 +248,9 @@ static int mchp_eic_init(struct device_node *node, struct device_node *parent) eic->irqs[i] = irq.args[1 ]; } - eic->domain =irq_domain_add_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , - node, &mchp_eic_domain_ops, eic); + eic->domain =irq_domain_create_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , +of_fwnode_handle (node), &mchp_eic_domain_ops, + eic);if (!eic->domain) {pr_err ("%pOF: Failed to add domain\n" , node); ret = -ENODEV ;
drivers/irqchip/irq-mips-cpu.c +5 -8
@@ -238,11 +238,9 @@ static void mips_cpu_register_ipi_domain(struct device_node *of_node)struct cpu_ipi_domain_state *ipi_domain_state; ipi_domain_state =kzalloc (sizeof (*ipi_domain_state),GFP_KERNEL ); - ipi_domain =irq_domain_add_hierarchy (irq_domain, -IRQ_DOMAIN_FLAG_IPI_SINGLE , -2 , of_node, - &mips_cpu_ipi_chip_ops, - ipi_domain_state); + ipi_domain =irq_domain_create_hierarchy (irq_domain,IRQ_DOMAIN_FLAG_IPI_SINGLE ,2 , +of_fwnode_handle (of_node), + &mips_cpu_ipi_chip_ops, ipi_domain_state);if (!ipi_domain)panic ("Failed to add MIPS CPU IPI domain" );irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI );
@@ -260,9 +258,8 @@ static void __init __mips_cpu_irq_init(struct device_node *of_node)clear_c0_status (ST0_IM );clear_c0_cause (CAUSEF_IP ); - irq_domain =irq_domain_add_legacy (of_node,8 ,MIPS_CPU_IRQ_BASE ,0 , - &mips_cpu_intc_irq_domain_ops, -NULL ); + irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),8 ,MIPS_CPU_IRQ_BASE ,0 , + &mips_cpu_intc_irq_domain_ops,NULL );if (!irq_domain)panic ("Failed to add irqdomain for MIPS CPU" );
drivers/irqchip/irq-mips-gic.c +8 -7
@@ -841,10 +841,10 @@ static int gic_register_ipi_domain(struct device_node *node)struct irq_domain *gic_ipi_domain;unsigned int v[2 ], num_ipis; - gic_ipi_domain =irq_domain_add_hierarchy (gic_irq_domain, -IRQ_DOMAIN_FLAG_IPI_PER_CPU , -GIC_NUM_LOCAL_INTRS + gic_shared_intrs, - node, &gic_ipi_domain_ops,NULL ); + gic_ipi_domain =irq_domain_create_hierarchy (gic_irq_domain,IRQ_DOMAIN_FLAG_IPI_PER_CPU , +GIC_NUM_LOCAL_INTRS + gic_shared_intrs, +of_fwnode_handle (node), &gic_ipi_domain_ops, +NULL );if (!gic_ipi_domain) {pr_err ("Failed to add IPI domain" );return -ENXIO ;
@@ -963,9 +963,10 @@ static int __init gic_of_init(struct device_node *node, gic_irq_dispatch); } - gic_irq_domain =irq_domain_add_simple (node,GIC_NUM_LOCAL_INTRS + - gic_shared_intrs,0 , - &gic_irq_domain_ops,NULL ); + gic_irq_domain =irq_domain_create_simple (of_fwnode_handle (node), +GIC_NUM_LOCAL_INTRS + + gic_shared_intrs,0 , + &gic_irq_domain_ops,NULL );if (!gic_irq_domain) {pr_err ("Failed to add IRQ domain" );return -ENXIO ;
drivers/irqchip/irq-mmp.c +6 -6
@@ -261,9 +261,9 @@ static int __init mmp_init_bases(struct device_node *node) } icu_data[0 ].virq_base =0 ; - icu_data[0 ].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[0 ]); + icu_data[0 ].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[0 ]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[0 ].domain, irq);if (!ret) {
@@ -391,9 +391,9 @@ static int __init mmp2_mux_of_init(struct device_node *node,return -EINVAL ; icu_data[i].virq_base =0 ; - icu_data[i].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[i]); + icu_data[i].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[i]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[i].domain, irq);if (!ret) {
drivers/irqchip/irq-mscc-ocelot.c +2 -2
@@ -132,8 +132,8 @@ static int __init vcoreiii_irq_init(struct device_node *node,if (!parent_irq)return -EINVAL ; - domain =irq_domain_add_linear (node, p->n_irq, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), p->n_irq, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-mst-intc.c +2 -2
@@ -273,8 +273,8 @@ static int __init mst_intc_of_init(struct device_node *dn,raw_spin_lock_init (&cd->lock); cd->irq_start = irq_start; cd->nr_irqs = irq_end - irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , cd->nr_irqs, dn, - &mst_intc_domain_ops, cd); + domain =irq_domain_create_hierarchy (domain_parent,0 , cd->nr_irqs,of_fwnode_handle (dn), + &mst_intc_domain_ops, cd);if (!domain) {iounmap (cd->base);kfree (cd);
drivers/irqchip/irq-mtk-cirq.c +2 -3
@@ -336,9 +336,8 @@ static int __init mtk_cirq_of_init(struct device_node *node, cirq_data->offsets = match->data; irq_num = cirq_data->ext_irq_end - cirq_data->ext_irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , - irq_num, node, - &cirq_domain_ops, cirq_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , irq_num,of_fwnode_handle (node), + &cirq_domain_ops, cirq_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-mtk-sysirq.c +2 -2
@@ -207,8 +207,8 @@ static int __init mtk_sysirq_of_init(struct device_node *node, chip_data->which_word[i] = word; } - domain =irq_domain_add_hierarchy (domain_parent,0 , intpol_num, node, - &sysirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , intpol_num,of_fwnode_handle (node), + &sysirq_domain_ops, chip_data);if (!domain) { ret = -ENOMEM ; goto out_free_which_word;
drivers/irqchip/irq-mvebu-pic.c +2 -2
@@ -150,8 +150,8 @@ static int mvebu_pic_probe(struct platform_device *pdev)return -EINVAL ; } - pic->domain =irq_domain_add_linear (node,PIC_MAX_IRQS , - &mvebu_pic_domain_ops, pic); + pic->domain =irq_domain_create_linear (of_fwnode_handle (node),PIC_MAX_IRQS , + &mvebu_pic_domain_ops, pic);if (!pic->domain) {dev_err (&pdev->dev,"Failed to allocate irq domain\n" );return -ENOMEM ;
drivers/irqchip/irq-mxs.c +2 -2
@@ -162,8 +162,8 @@ static const struct irq_domain_ops icoll_irq_domain_ops = {static void __init icoll_add_domain (struct device_node *np,int num) { - icoll_domain =irq_domain_add_linear (np, num, - &icoll_irq_domain_ops,NULL ); + icoll_domain =irq_domain_create_linear (of_fwnode_handle (np), num, + &icoll_irq_domain_ops,NULL );if (!icoll_domain)panic ("%pOF: unable to create irq domain" , np);
drivers/irqchip/irq-nvic.c +1 -1
@@ -90,7 +90,7 @@ static int __init nvic_of_init(struct device_node *node, irqs =NVIC_MAX_IRQ ; nvic_irq_domain = -irq_domain_add_linear (node, irqs, &nvic_irq_domain_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node), irqs, &nvic_irq_domain_ops,NULL );if (!nvic_irq_domain) {pr_warn ("Failed to allocate irq domain\n" );
drivers/irqchip/irq-omap-intc.c +2 -2
@@ -248,7 +248,7 @@ static int __init omap_init_irq_of(struct device_node *node)if (WARN_ON (!omap_irq_base))return -ENOMEM ; - domain =irq_domain_add_linear (node, omap_nr_irqs, + domain =irq_domain_create_linear (of_fwnode_handle (node), omap_nr_irqs, &irq_generic_chip_ops,NULL );omap_irq_soft_reset ();
@@ -274,7 +274,7 @@ static int __init omap_init_irq_legacy(u32 base, struct device_node *node) irq_base =0 ; } - domain =irq_domain_add_legacy (node, omap_nr_irqs, irq_base,0 , + domain =irq_domain_create_legacy (of_fwnode_handle (node), omap_nr_irqs, irq_base,0 , &irq_domain_simple_ops,NULL );omap_irq_soft_reset ();
drivers/irqchip/irq-or1k-pic.c +2 -2
@@ -144,8 +144,8 @@ static int __init or1k_pic_init(struct device_node *node,/* Disable all interrupts until explicitly requested */ mtspr (SPR_PICMR , (0UL )); - root_domain =irq_domain_add_linear (node,32 , &or1k_irq_domain_ops, - pic); + root_domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &or1k_irq_domain_ops, + pic);set_handle_irq (or1k_pic_handle_irq);
drivers/irqchip/irq-orion.c +3 -3
@@ -59,7 +59,7 @@ static int __init orion_irq_init(struct device_node *np,/* count number of irq chips by valid reg addresses */ num_chips =of_address_count (np); - orion_irq_domain =irq_domain_add_linear (np, + orion_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), num_chips *ORION_IRQS_PER_CHIP , &irq_generic_chip_ops,NULL );if (!orion_irq_domain)
@@ -146,8 +146,8 @@ static int __init orion_bridge_irq_init(struct device_node *np,/* get optional number of interrupts provided */ of_property_read_u32 (np,"marvell,#interrupts" , &nrirqs); - domain =irq_domain_add_linear (np, nrirqs, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , np);return -ENOMEM ;
drivers/irqchip/irq-owl-sirq.c +2 -2
@@ -323,8 +323,8 @@ static int __init owl_sirq_init(const struct owl_sirq_params *params,owl_sirq_clear_set_extctl (chip_data,0 ,INTC_EXTCTL_CLK_SEL , i); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_SIRQ , node, - &owl_sirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_SIRQ ,of_fwnode_handle (node), + &owl_sirq_domain_ops, chip_data);if (!domain) {pr_err ("%pOF: failed to add domain\n" , node); ret = -ENOMEM ;
drivers/irqchip/irq-pic32-evic.c +3 -3
@@ -227,9 +227,9 @@ static int __init pic32_of_init(struct device_node *node, goto err_iounmap; } - evic_irq_domain =irq_domain_add_linear (node, nchips *32 , - &pic32_irq_domain_ops, - priv); + evic_irq_domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , + &pic32_irq_domain_ops, + priv);if (!evic_irq_domain) { ret = -ENOMEM ; goto err_free_priv;
drivers/irqchip/irq-pruss-intc.c +2 -2
@@ -555,8 +555,8 @@ static int pruss_intc_probe(struct platform_device *pdev)mutex_init (&intc->lock); - intc->domain =irq_domain_add_linear (dev->of_node, max_system_events, - &pruss_intc_irq_domain_ops, intc); + intc->domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), max_system_events, + &pruss_intc_irq_domain_ops, intc);if (!intc->domain)return -ENOMEM ;
drivers/irqchip/irq-realtek-rtl.c +1 -1
@@ -162,7 +162,7 @@ static int __init realtek_rtl_of_init(struct device_node *node, struct device_noelse if (!parent_irq)return -ENODEV ; - domain =irq_domain_add_linear (node,RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL );if (!domain)return -ENOMEM ;
drivers/irqchip/irq-renesas-intc-irqpin.c +4 -2
@@ -513,8 +513,10 @@ static int intc_irqpin_probe(struct platform_device *pdev) irq_chip->irq_set_wake = intc_irqpin_irq_set_wake; irq_chip->flags =IRQCHIP_MASK_ON_SUSPEND ; - p->irq_domain =irq_domain_add_simple (dev->of_node, nirqs,0 , - &intc_irqpin_irq_domain_ops, p); + p->irq_domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node), + nirqs,0 , + &intc_irqpin_irq_domain_ops, + p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-irqc.c +2 -2
@@ -168,8 +168,8 @@ static int irqc_probe(struct platform_device *pdev) p->cpu_int_base = p->iomem +IRQC_INT_CPU_BASE (0 );/* SYS-SPI */ - p->irq_domain =irq_domain_add_linear (dev->of_node, p->number_of_irqs, - &irq_generic_chip_ops, p); + p->irq_domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), p->number_of_irqs, + &irq_generic_chip_ops, p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-rza1.c +3 -3
@@ -231,9 +231,9 @@ static int rza1_irqc_probe(struct platform_device *pdev) priv->chip.irq_set_type = rza1_irqc_set_type; priv->chip.flags =IRQCHIP_MASK_ON_SUSPEND |IRQCHIP_SKIP_SET_WAKE ; - priv->irq_domain =irq_domain_add_hierarchy (parent,0 ,IRQC_NUM_IRQ , - np, &rza1_irqc_domain_ops, - priv); + priv->irq_domain =irq_domain_create_hierarchy (parent,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (np), &rza1_irqc_domain_ops, + priv);if (!priv->irq_domain) {dev_err (dev,"cannot initialize irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-renesas-rzg2l.c +3 -3
@@ -574,9 +574,9 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node *raw_spin_lock_init (&rzg2l_irqc_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , - node, &rzg2l_irqc_domain_ops, - rzg2l_irqc_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (node), &rzg2l_irqc_domain_ops, + rzg2l_irqc_data);if (!irq_domain) {pm_runtime_put (dev);return dev_err_probe (dev, -ENOMEM ,"failed to add irq domain\n" );
drivers/irqchip/irq-renesas-rzv2h.c +3 -2
@@ -514,8 +514,9 @@ static int rzv2h_icu_init_common(struct device_node *node, struct device_node *praw_spin_lock_init (&rzv2h_icu_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , node, - &rzv2h_icu_domain_ops, rzv2h_icu_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , +of_fwnode_handle (node), &rzv2h_icu_domain_ops, + rzv2h_icu_data);if (!irq_domain) {dev_err (&pdev->dev,"failed to add irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-sa11x0.c +1 -1
@@ -162,7 +162,7 @@ void __init sa11x0_init_irq_nodt(int irq_start, resource_size_t io_start)*/ writel_relaxed (1 , iobase +ICCR ); - sa1100_normal_irqdomain =irq_domain_add_simple (NULL , + sa1100_normal_irqdomain =irq_domain_create_simple (NULL ,32 , irq_start, &sa1100_normal_irqdomain_ops,NULL );
drivers/irqchip/irq-sni-exiu.c +2 -2
@@ -253,8 +253,8 @@ static int __init exiu_dt_init(struct device_node *node,if (IS_ERR (data))return PTR_ERR (data); - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_IRQS , node, - &exiu_domain_ops, data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_IRQS ,of_fwnode_handle (node), + &exiu_domain_ops, data);if (!domain) {pr_err ("%pOF: failed to allocate domain\n" , node); goto out_unmap;
drivers/irqchip/irq-sp7021-intc.c +2 -2
@@ -256,8 +256,8 @@ static int __init sp_intc_init_dt(struct device_node *node, struct device_node *writel_relaxed (~0 ,REG_INTR_CLEAR + i *4 ); } - sp_intc.domain =irq_domain_add_linear (node,SP_INTC_NR_IRQS , - &sp_intc_dm_ops, &sp_intc); + sp_intc.domain =irq_domain_create_linear (of_fwnode_handle (node),SP_INTC_NR_IRQS , + &sp_intc_dm_ops, &sp_intc);if (!sp_intc.domain) { ret = -ENOMEM ; goto out_unmap1;
drivers/irqchip/irq-starfive-jh8100-intc.c +2 -2
@@ -158,8 +158,8 @@ static int __init starfive_intc_init(struct device_node *intc,raw_spin_lock_init (&irqc->lock); - irqc->domain =irq_domain_add_linear (intc,STARFIVE_INTC_SRC_IRQ_NUM , - &starfive_intc_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (intc),STARFIVE_INTC_SRC_IRQ_NUM , + &starfive_intc_domain_ops, irqc);if (!irqc->domain) {pr_err ("Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-stm32-exti.c +2 -2
@@ -344,8 +344,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data,if (!host_data)return -ENOMEM ; - domain =irq_domain_add_linear (node, drv_data->bank_nr *IRQS_PER_BANK , - &irq_exti_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), drv_data->bank_nr *IRQS_PER_BANK , + &irq_exti_domain_ops,NULL );if (!domain) {pr_err ("%pOFn: Could not register interrupt domain.\n" , node);
drivers/irqchip/irq-stm32mp-exti.c +3 -4
@@ -682,10 +682,9 @@ static int stm32mp_exti_probe(struct platform_device *pdev)return -EINVAL ; } - domain =irq_domain_add_hierarchy (parent_domain,0 , - drv_data->bank_nr *IRQS_PER_BANK , - np, &stm32mp_exti_domain_ops, - host_data); + domain =irq_domain_create_hierarchy (parent_domain,0 , drv_data->bank_nr *IRQS_PER_BANK , +of_fwnode_handle (np), &stm32mp_exti_domain_ops, + host_data);if (!domain) {dev_err (dev,"Could not register exti domain\n" );
drivers/irqchip/irq-sun4i.c +1 -1
@@ -133,7 +133,7 @@ static int __init sun4i_of_init(struct device_node *node,/* Configure the external interrupt source type */ writel (0x00 , irq_ic_data->irq_base +SUN4I_IRQ_NMI_CTRL_REG ); - irq_ic_data->irq_domain =irq_domain_add_linear (node,3 *32 , + irq_ic_data->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),3 *32 , &sun4i_irq_ops,NULL );if (!irq_ic_data->irq_domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-sun6i-r.c +2 -2
@@ -338,8 +338,8 @@ static int __init sun6i_r_intc_init(struct device_node *node,return PTR_ERR (base); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 , node, - &sun6i_r_intc_domain_ops,NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 ,of_fwnode_handle (node), + &sun6i_r_intc_domain_ops,NULL );if (!domain) {pr_err ("%pOF: Failed to allocate domain\n" , node);iounmap (base);
drivers/irqchip/irq-sunxi-nmi.c +1 -1
@@ -159,7 +159,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,struct irq_domain *domain;int ret; - domain =irq_domain_add_linear (node,1 , &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),1 , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Could not register interrupt domain.\n" );return -ENOMEM ;
drivers/irqchip/irq-tb10x.c +4 -4
@@ -121,13 +121,13 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, goto ioremap_fail; } - domain =irq_domain_add_linear (ictl,AB_IRQCTL_MAXIRQ , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (ictl),AB_IRQCTL_MAXIRQ , + &irq_generic_chip_ops,NULL );if (!domain) { ret = -ENOMEM ;pr_err ("%pOFn: Could not register interrupt domain.\n" , ictl); - goto irq_domain_add_fail; + goto irq_domain_create_fail; } ret = irq_alloc_domain_generic_chips(domain, AB_IRQCTL_MAXIRQ,
@@ -174,7 +174,7 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, gc_alloc_fail:irq_domain_remove (domain); -irq_domain_add_fail: +irq_domain_create_fail:iounmap (reg_base); ioremap_fail:release_mem_region (mem.start,resource_size (&mem));
drivers/irqchip/irq-tegra.c +2 -3
@@ -330,9 +330,8 @@ static int __init tegra_ictlr_init(struct device_node *node, node, num_ictlrs, soc->num_ictlrs); - domain =irq_domain_add_hierarchy (parent_domain,0 , num_ictlrs *32 , - node, &tegra_ictlr_domain_ops, - lic); + domain =irq_domain_create_hierarchy (parent_domain,0 , num_ictlrs *32 , +of_fwnode_handle (node), &tegra_ictlr_domain_ops, lic);if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node); err = -ENOMEM ;
drivers/irqchip/irq-ti-sci-inta.c +3 -3
@@ -701,9 +701,9 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)if (ret)return ret; - domain =irq_domain_add_linear (dev_of_node (dev), -ti_sci_get_num_resources (inta->vint), - &ti_sci_inta_irq_domain_ops, inta); + domain =irq_domain_create_linear (of_fwnode_handle (dev_of_node (dev)), +ti_sci_get_num_resources (inta->vint), + &ti_sci_inta_irq_domain_ops, inta);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ti-sci-intr.c +3 -2
@@ -274,8 +274,9 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)return PTR_ERR (intr->out_irqs); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 ,dev_of_node (dev), - &ti_sci_intr_irq_domain_ops, intr); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 , +of_fwnode_handle (dev_of_node (dev)), + &ti_sci_intr_irq_domain_ops, intr);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ts4800.c +1 -1
@@ -125,7 +125,7 @@ static int ts4800_ic_probe(struct platform_device *pdev)return -EINVAL ; } - data->domain =irq_domain_add_linear (node,8 , &ts4800_ic_ops, data); + data->domain =irq_domain_create_linear (of_fwnode_handle (node),8 , &ts4800_ic_ops, data);if (!data->domain) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-versatile-fpga.c +2 -2
@@ -176,8 +176,8 @@ static void __init fpga_irq_init(void __iomem *base, int parent_irq, f); } - f->domain =irq_domain_add_linear (node,fls (valid), - &fpga_irqdomain_ops, f); + f->domain =irq_domain_create_linear (of_fwnode_handle (node),fls (valid), + &fpga_irqdomain_ops, f);/* This will allocate all valid descriptors in the linear case */ for (i =0 ; i <fls (valid); i++)
drivers/irqchip/irq-vf610-mscm-ir.c +3 -3
@@ -209,9 +209,9 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node,regmap_read (mscm_cp_regmap, MSCM_CPxNUM, &cpuid); mscm_ir_data->cpu_mask =0x1 << cpuid; - domain =irq_domain_add_hierarchy (domain_parent,0 , -MSCM_IRSPRC_NUM , node, - &mscm_irq_domain_ops, mscm_ir_data); + domain =irq_domain_create_hierarchy (domain_parent,0 ,MSCM_IRSPRC_NUM , +of_fwnode_handle (node), &mscm_irq_domain_ops, + mscm_ir_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-vic.c +3 -2
@@ -289,8 +289,9 @@ static void __init vic_register(void __iomem *base, unsigned int parent_irq, vic_handle_irq_cascaded, v); } - v->domain =irq_domain_add_simple (node,fls (valid_sources), irq, - &vic_irqdomain_ops, v); + v->domain =irq_domain_create_simple (of_fwnode_handle (node), +fls (valid_sources), irq, + &vic_irqdomain_ops, v);/* create an IRQ mapping for each valid IRQ */ for (i =0 ; i <fls (valid_sources); i++)if (valid_sources & (1 << i))
drivers/irqchip/irq-vt8500.c +1 -1
@@ -200,7 +200,7 @@ static int __init vt8500_irq_init(struct device_node *node, } intc[active_cnt].base =of_iomap (np,0 ); - intc[active_cnt].domain =irq_domain_add_linear (node,64 , + intc[active_cnt].domain =irq_domain_create_linear (of_fwnode_handle (node),64 , &vt8500_irq_domain_ops, &intc[active_cnt]);if (!intc[active_cnt].base) {
drivers/irqchip/irq-wpcm450-aic.c +1 -1
@@ -154,7 +154,7 @@ static int __init wpcm450_aic_of_init(struct device_node *node,set_handle_irq (wpcm450_aic_handle_irq); - aic->domain =irq_domain_add_linear (node,AIC_NUM_IRQS , &wpcm450_aic_ops, aic); + aic->domain =irq_domain_create_linear (of_fwnode_handle (node),AIC_NUM_IRQS , &wpcm450_aic_ops, aic);return 0 ; }
drivers/irqchip/irq-xilinx-intc.c +2 -2
@@ -212,8 +212,8 @@ static int __init xilinx_intc_of_init(struct device_node *intc,xintc_write (irqc,MER ,MER_HIE |MER_ME ); } - irqc->root_domain =irq_domain_add_linear (intc, irqc->nr_irq, - &xintc_irq_domain_ops, irqc); + irqc->root_domain =irq_domain_create_linear (of_fwnode_handle (intc), irqc->nr_irq, + &xintc_irq_domain_ops, irqc);if (!irqc->root_domain) {pr_err ("irq-xilinx: Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-xtensa-mx.c +2 -3
@@ -167,8 +167,7 @@ static void __init xtensa_mx_init_common(struct irq_domain *root_domain)int __init xtensa_mx_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , - &xtensa_mx_irq_domain_ops, +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
@@ -178,7 +177,7 @@ static int __init xtensa_mx_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_mx_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
drivers/irqchip/irq-xtensa-pic.c +2 -2
@@ -85,7 +85,7 @@ static struct irq_chip xtensa_irq_chip = {int __init xtensa_pic_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
@@ -95,7 +95,7 @@ static int __init xtensa_pic_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
drivers/irqchip/irq-zevio.c +2 -2
@@ -92,8 +92,8 @@ static int __init zevio_of_init(struct device_node *node,zevio_init_irq_base (zevio_irq_io +IO_IRQ_BASE );zevio_init_irq_base (zevio_irq_io +IO_FIQ_BASE ); - zevio_irq_domain =irq_domain_add_linear (node,MAX_INTRS , - &irq_generic_chip_ops,NULL ); + zevio_irq_domain =irq_domain_create_linear (of_fwnode_handle (node),MAX_INTRS , + &irq_generic_chip_ops,NULL );BUG_ON (!zevio_irq_domain); ret = irq_alloc_domain_generic_chips(zevio_irq_domain, MAX_INTRS, 1,
drivers/irqchip/spear-shirq.c +1 -1
@@ -239,7 +239,7 @@ static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr, goto err_unmap; } - shirq_domain =irq_domain_add_legacy (np, nr_irqs, virq_base,0 , + shirq_domain =irq_domain_create_legacy (of_fwnode_handle (np), nr_irqs, virq_base,0 , &irq_domain_simple_ops,NULL );if (WARN_ON (!shirq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
[tip: irq/cleanups] irqchip: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 5817511a830411c24a4c00197e093e8a917754ec Gitweb: https://git.kernel.org/tip/5817511a830411c24a4c00197e093e8a917754ec Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:14 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 15:39:39 +02:00
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 ]
--- drivers/irqchip/exynos-combiner.c | 2 +- drivers/irqchip/irq-al-fic.c | 2 +- drivers/irqchip/irq-alpine-msi.c | 5 ++--- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-aspeed-i2c-ic.c | 2 +- drivers/irqchip/irq-aspeed-intc.c | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 2 +- drivers/irqchip/irq-aspeed-vic.c | 4 ++-- drivers/irqchip/irq-ath79-misc.c | 4 ++-- drivers/irqchip/irq-atmel-aic-common.c | 2 +- drivers/irqchip/irq-bcm2712-mip.c | 4 ++-- drivers/irqchip/irq-bcm2835.c | 2 +- drivers/irqchip/irq-bcm2836.c | 2 +- drivers/irqchip/irq-bcm6345-l1.c | 2 +- drivers/irqchip/irq-bcm7038-l1.c | 2 +- drivers/irqchip/irq-bcm7120-l2.c | 2 +- drivers/irqchip/irq-brcmstb-l2.c | 2 +- drivers/irqchip/irq-clps711x.c | 4 ++-- drivers/irqchip/irq-crossbar.c | 6 ++---- drivers/irqchip/irq-csky-apb-intc.c | 2 +- drivers/irqchip/irq-csky-mpintc.c | 2 +- drivers/irqchip/irq-davinci-cp-intc.c | 6 ++++-- drivers/irqchip/irq-digicolor.c | 2 +- drivers/irqchip/irq-dw-apb-ictl.c | 2 +- drivers/irqchip/irq-ftintc010.c | 5 +++-- drivers/irqchip/irq-goldfish-pic.c | 7 +++---- drivers/irqchip/irq-hip04.c | 6 ++---- drivers/irqchip/irq-i8259.c | 4 ++-- drivers/irqchip/irq-idt3243x.c | 2 +- drivers/irqchip/irq-imgpdc.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 4 ++-- drivers/irqchip/irq-imx-intmux.c | 2 +- drivers/irqchip/irq-imx-irqsteer.c | 2 +- drivers/irqchip/irq-ingenic-tcu.c | 4 ++-- drivers/irqchip/irq-ingenic.c | 4 ++-- drivers/irqchip/irq-jcore-aic.c | 5 ++--- drivers/irqchip/irq-keystone.c | 4 ++-- drivers/irqchip/irq-lpc32xx.c | 4 ++-- drivers/irqchip/irq-ls-extirq.c | 4 ++-- drivers/irqchip/irq-ls-scfg-msi.c | 8 ++++---- drivers/irqchip/irq-ls1x.c | 4 ++-- drivers/irqchip/irq-mchp-eic.c | 5 +++-- drivers/irqchip/irq-mips-cpu.c | 13 +++++-------- drivers/irqchip/irq-mips-gic.c | 15 ++++++++------- drivers/irqchip/irq-mmp.c | 12 ++++++------ drivers/irqchip/irq-mscc-ocelot.c | 4 ++-- drivers/irqchip/irq-mst-intc.c | 4 ++-- drivers/irqchip/irq-mtk-cirq.c | 5 ++--- drivers/irqchip/irq-mtk-sysirq.c | 4 ++-- drivers/irqchip/irq-mvebu-pic.c | 4 ++-- drivers/irqchip/irq-mxs.c | 4 ++-- drivers/irqchip/irq-nvic.c | 2 +- drivers/irqchip/irq-omap-intc.c | 4 ++-- drivers/irqchip/irq-or1k-pic.c | 4 ++-- drivers/irqchip/irq-orion.c | 6 +++--- drivers/irqchip/irq-owl-sirq.c | 4 ++-- drivers/irqchip/irq-pic32-evic.c | 6 +++--- drivers/irqchip/irq-pruss-intc.c | 4 ++-- drivers/irqchip/irq-realtek-rtl.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 6 ++++-- drivers/irqchip/irq-renesas-irqc.c | 4 ++-- drivers/irqchip/irq-renesas-rza1.c | 6 +++--- drivers/irqchip/irq-renesas-rzg2l.c | 6 +++--- drivers/irqchip/irq-renesas-rzv2h.c | 5 +++-- drivers/irqchip/irq-sa11x0.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 4 ++-- drivers/irqchip/irq-sp7021-intc.c | 4 ++-- drivers/irqchip/irq-starfive-jh8100-intc.c | 4 ++-- drivers/irqchip/irq-stm32-exti.c | 4 ++-- drivers/irqchip/irq-stm32mp-exti.c | 7 +++---- drivers/irqchip/irq-sun4i.c | 2 +- drivers/irqchip/irq-sun6i-r.c | 4 ++-- drivers/irqchip/irq-sunxi-nmi.c | 2 +- drivers/irqchip/irq-tb10x.c | 8 ++++---- drivers/irqchip/irq-tegra.c | 5 ++--- drivers/irqchip/irq-ti-sci-inta.c | 6 +++--- drivers/irqchip/irq-ti-sci-intr.c | 5 +++-- drivers/irqchip/irq-ts4800.c | 2 +- drivers/irqchip/irq-versatile-fpga.c | 4 ++-- drivers/irqchip/irq-vf610-mscm-ir.c | 6 +++--- drivers/irqchip/irq-vic.c | 5 +++-- drivers/irqchip/irq-wpcm450-aic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 4 ++-- drivers/irqchip/irq-xtensa-mx.c | 5 ++--- drivers/irqchip/irq-xtensa-pic.c | 4 ++-- drivers/irqchip/irq-zevio.c | 4 ++-- drivers/irqchip/spear-shirq.c | 2 +- 87 files changed, 180 insertions(+), 184 deletions(-)
drivers/irqchip/exynos-combiner.c +1 -1
@@ -180,7 +180,7 @@ static void __init combiner_init(void __iomem *combiner_base,if (!combiner_data)return ; - combiner_irq_domain =irq_domain_add_linear (np, nr_irq, + combiner_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), nr_irq, &combiner_irq_domain_ops, combiner_data);if (WARN_ON (!combiner_irq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
drivers/irqchip/irq-al-fic.c +1 -1
@@ -139,7 +139,7 @@ static int al_fic_register(struct device_node *node,struct irq_chip_generic *gc;int ret; - fic->domain =irq_domain_add_linear (node, + fic->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_FIC_IRQS , &irq_generic_chip_ops, fic);
drivers/irqchip/irq-alpine-msi.c +2 -3
@@ -205,9 +205,8 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENXIO ; } - middle_domain =irq_domain_add_hierarchy (gic_domain,0 ,0 ,NULL , - &alpine_msix_middle_domain_ops, - priv); + middle_domain =irq_domain_create_hierarchy (gic_domain,0 ,0 ,NULL , + &alpine_msix_middle_domain_ops, priv);if (!middle_domain) {pr_err ("Failed to create the MSIX middle domain\n" );return -ENOMEM ;
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -348,7 +348,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node, mpic->msi_doorbell_mask =PCI_MSI_FULL_DOORBELL_MASK ; } - mpic->msi_inner_domain =irq_domain_add_linear (NULL , mpic->msi_doorbell_size, + mpic->msi_inner_domain =irq_domain_create_linear (NULL , mpic->msi_doorbell_size, &mpic_msi_domain_ops, mpic);if (!mpic->msi_inner_domain)return -ENOMEM ;
@@ -861,7 +861,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *parif (!mpic_is_ipi_available (mpic)) nr_irqs =MPIC_PER_CPU_IRQS_NR ; - mpic->domain =irq_domain_add_linear (node, nr_irqs, &mpic_irq_ops, mpic); + mpic->domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, &mpic_irq_ops, mpic);if (!mpic->domain) {pr_err ("%pOF: Unable to add IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-aspeed-i2c-ic.c +1 -1
@@ -82,7 +82,7 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node, goto err_iounmap; } - i2c_ic->irq_domain =irq_domain_add_linear (node,ASPEED_I2C_IC_NUM_BUS , + i2c_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),ASPEED_I2C_IC_NUM_BUS , &aspeed_i2c_ic_irq_domain_ops,NULL );if (!i2c_ic->irq_domain) {
drivers/irqchip/irq-aspeed-intc.c +1 -1
@@ -102,7 +102,7 @@ static int __init aspeed_intc_ic_of_init(struct device_node *node,writel (0xffffffff , intc_ic->base +INTC_INT_STATUS_REG );writel (0x0 , intc_ic->base +INTC_INT_ENABLE_REG ); - intc_ic->irq_domain =irq_domain_add_linear (node,INTC_IRQS_PER_WORD , + intc_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),INTC_IRQS_PER_WORD , &aspeed_intc_ic_irq_domain_ops, intc_ic);if (!intc_ic->irq_domain) { ret = -ENOMEM ;
drivers/irqchip/irq-aspeed-scu-ic.c +1 -1
@@ -165,7 +165,7 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_scu_ic *scu_ic, goto err; } - scu_ic->irq_domain =irq_domain_add_linear (node, scu_ic->num_irqs, + scu_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node), scu_ic->num_irqs, &aspeed_scu_ic_domain_ops, scu_ic);if (!scu_ic->irq_domain) {
drivers/irqchip/irq-aspeed-vic.c +2 -2
@@ -211,8 +211,8 @@ static int __init avic_of_init(struct device_node *node,set_handle_irq (avic_handle_irq);/* Register our domain */ - vic->dom =irq_domain_add_simple (node,NUM_IRQS ,0 , - &avic_dom_ops, vic); + vic->dom =irq_domain_create_simple (of_fwnode_handle (node),NUM_IRQS ,0 , + &avic_dom_ops, vic);return 0 ; }
drivers/irqchip/irq-ath79-misc.c +2 -2
@@ -147,7 +147,7 @@ static int __init ath79_misc_intc_of_init(return -ENOMEM ; } - domain =irq_domain_add_linear (node,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_linear (of_fwnode_handle (node),ATH79_MISC_IRQ_COUNT , &misc_irq_domain_ops, base);if (!domain) {pr_err ("Failed to add MISC irqdomain\n" );
@@ -188,7 +188,7 @@ void __init ath79_misc_irq_init(void __iomem *regs, int irq,else ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack; - domain =irq_domain_add_legacy (NULL ,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_legacy (NULL ,ATH79_MISC_IRQ_COUNT , irq_base,0 , &misc_irq_domain_ops, regs);if (!domain)panic ("Failed to create MISC irqdomain" );
drivers/irqchip/irq-atmel-aic-common.c +1 -1
@@ -228,7 +228,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node, goto err_iounmap; } - domain =irq_domain_add_linear (node, nchips *32 , ops, aic); + domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , ops, aic);if (!domain) { ret = -ENOMEM ; goto err_free_aic;
drivers/irqchip/irq-bcm2712-mip.c +2 -2
@@ -173,8 +173,8 @@ static int mip_init_domains(struct mip_priv *mip, struct device_node *np) {struct irq_domain *middle; - middle =irq_domain_add_hierarchy (mip->parent,0 , mip->num_msis, np, - &mip_middle_domain_ops, mip); + middle =irq_domain_create_hierarchy (mip->parent,0 , mip->num_msis,of_fwnode_handle (np), + &mip_middle_domain_ops, mip);if (!middle)return -ENOMEM ;
drivers/irqchip/irq-bcm2835.c +1 -1
@@ -144,7 +144,7 @@ static int __init armctrl_of_init(struct device_node *node,if (!base)panic ("%pOF: unable to map IC registers\n" , node); - intc.domain =irq_domain_add_linear (node,MAKE_HWIRQ (NR_BANKS ,0 ), + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),MAKE_HWIRQ (NR_BANKS ,0 ), &armctrl_ops,NULL );if (!intc.domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-bcm2836.c +1 -1
@@ -325,7 +325,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node,bcm2835_init_local_timer_frequency (); - intc.domain =irq_domain_add_linear (node,LAST_IRQ +1 , + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),LAST_IRQ +1 , &bcm2836_arm_irqchip_intc_ops,NULL );if (!intc.domain)
drivers/irqchip/irq-bcm6345-l1.c +1 -1
@@ -316,7 +316,7 @@ static int __init bcm6345_l1_of_init(struct device_node *dn,raw_spin_lock_init (&intc->lock); - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm6345_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7038-l1.c +1 -1
@@ -416,7 +416,7 @@ static int __init bcm7038_l1_of_init(struct device_node *dn, } } - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm7038_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7120-l2.c +1 -1
@@ -264,7 +264,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, goto out_free_l1_data; } - data->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * data->n_words, + data->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * data->n_words, &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-brcmstb-l2.c +1 -1
@@ -182,7 +182,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, goto out_unmap; } - data->domain =irq_domain_add_linear (np,32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-clps711x.c +2 -2
@@ -184,8 +184,8 @@ static int __init _clps711x_intc_init(struct device_node *np, clps711x_intc->ops.map = clps711x_intc_irq_map; clps711x_intc->ops.xlate = irq_domain_xlate_onecell; clps711x_intc->domain = -irq_domain_add_legacy (np,ARRAY_SIZE (clps711x_irqs), -0 ,0 , &clps711x_intc->ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (np),ARRAY_SIZE (clps711x_irqs),0 ,0 , + &clps711x_intc->ops,NULL );if (!clps711x_intc->domain) { err = -ENOMEM ; goto out_irqfree;
drivers/irqchip/irq-crossbar.c +2 -4
@@ -351,10 +351,8 @@ static int __init irqcrossbar_init(struct device_node *node,if (err)return err; - domain =irq_domain_add_hierarchy (parent_domain,0 , - cb->max_crossbar_sources, - node, &crossbar_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 , cb->max_crossbar_sources, +of_fwnode_handle (node), &crossbar_domain_ops,NULL );if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-csky-apb-intc.c +1 -1
@@ -114,7 +114,7 @@ ck_intc_init_comm(struct device_node *node, struct device_node *parent)return -EINVAL ; } - root_domain =irq_domain_add_linear (node, nr_irq, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &irq_generic_chip_ops,NULL );if (!root_domain) {pr_err ("C-SKY Intc irq_domain_add failed.\n" );
drivers/irqchip/irq-csky-mpintc.c +1 -1
@@ -255,7 +255,7 @@ csky_mpintc_init(struct device_node *node, struct device_node *parent)writel_relaxed (BIT (0 ), INTCG_base +INTCG_ICTLR ); } - root_domain =irq_domain_add_linear (node, nr_irq, &csky_irqdomain_ops, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &csky_irqdomain_ops,NULL );if (!root_domain)return -ENXIO ;
drivers/irqchip/irq-davinci-cp-intc.c +4 -2
@@ -204,8 +204,10 @@ static int __init davinci_cp_intc_do_init(struct resource *res, unsigned int numreturn irq_base; } - davinci_cp_intc_irq_domain =irq_domain_add_legacy (node, num_irqs, irq_base,0 , - &davinci_cp_intc_irq_domain_ops,NULL ); + davinci_cp_intc_irq_domain =irq_domain_create_legacy (of_fwnode_handle (node), num_irqs, + irq_base,0 , + &davinci_cp_intc_irq_domain_ops, +NULL );if (!davinci_cp_intc_irq_domain) {pr_err ("%s: unable to create an interrupt domain\n" , __func__);
drivers/irqchip/irq-digicolor.c +1 -1
@@ -95,7 +95,7 @@ static int __init digicolor_of_init(struct device_node *node,regmap_write (ucregs,UC_IRQ_CONTROL ,1 ); digicolor_irq_domain = -irq_domain_add_linear (node,64 , &irq_generic_chip_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node),64 , &irq_generic_chip_ops,NULL );if (!digicolor_irq_domain) {pr_err ("%pOF: unable to create IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-dw-apb-ictl.c +1 -1
@@ -173,7 +173,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,else nrirqs =fls (readl_relaxed (iobase +APB_INT_ENABLE_L )); - domain =irq_domain_add_linear (np, nrirqs, domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, domain_ops,NULL );if (!domain) {pr_err ("%pOF: unable to add irq domain\n" , np); ret = -ENOMEM ;
drivers/irqchip/irq-ftintc010.c +3 -2
@@ -180,8 +180,9 @@ static int __init ft010_of_init_irq(struct device_node *node,writel (0 ,FT010_IRQ_MASK (f->base));writel (0 ,FT010_FIQ_MASK (f->base)); - f->domain =irq_domain_add_simple (node,FT010_NUM_IRQS ,0 , - &ft010_irqdomain_ops, f); + f->domain =irq_domain_create_simple (of_fwnode_handle (node), +FT010_NUM_IRQS ,0 , + &ft010_irqdomain_ops, f);set_handle_irq (ft010_irqchip_handle_irq);return 0 ;
drivers/irqchip/irq-goldfish-pic.c +3 -4
@@ -101,10 +101,9 @@ static int __init goldfish_pic_of_init(struct device_node *of_node,irq_setup_generic_chip (gc,IRQ_MSK (GFPIC_NR_IRQS ),0 ,IRQ_NOPROBE |IRQ_LEVEL ,0 ); - gfpic->irq_domain =irq_domain_add_legacy (of_node,GFPIC_NR_IRQS , -GFPIC_IRQ_BASE ,0 , - &goldfish_irq_domain_ops, -NULL ); + gfpic->irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),GFPIC_NR_IRQS , +GFPIC_IRQ_BASE ,0 , &goldfish_irq_domain_ops, +NULL );if (!gfpic->irq_domain) {pr_err ("Failed to add irqdomain!\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-hip04.c +2 -4
@@ -386,10 +386,8 @@ hip04_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - hip04_data.domain =irq_domain_add_legacy (node, nr_irqs, irq_base, -0 , - &hip04_irq_domain_ops, - &hip04_data); + hip04_data.domain =irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &hip04_irq_domain_ops, &hip04_data);if (WARN_ON (!hip04_data.domain))return -EINVAL ;
drivers/irqchip/irq-i8259.c +2 -2
@@ -313,8 +313,8 @@ struct irq_domain * __init __init_i8259_irqs(struct device_node *node)init_8259A (0 ); - domain =irq_domain_add_legacy (node,16 ,I8259A_IRQ_BASE ,0 , - &i8259A_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (node),16 ,I8259A_IRQ_BASE ,0 , + &i8259A_ops,NULL );if (!domain)panic ("Failed to add i8259 IRQ domain" );
drivers/irqchip/irq-idt3243x.c +1 -1
@@ -72,7 +72,7 @@ static int idt_pic_init(struct device_node *of_node, struct device_node *parent) goto out_unmap_irq; } - domain =irq_domain_add_linear (of_node,IDT_PIC_NR_IRQS , + domain =irq_domain_create_linear (of_fwnode_handle (of_node),IDT_PIC_NR_IRQS , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Failed to add irqdomain!\n" );
drivers/irqchip/irq-imgpdc.c +1 -1
@@ -372,7 +372,7 @@ static int pdc_intc_probe(struct platform_device *pdev) priv->syswake_irq = irq;/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,16 , &irq_generic_chip_ops, + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),16 , &irq_generic_chip_ops, priv);if (unlikely (!priv->domain)) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );
drivers/irqchip/irq-imx-gpcv2.c +2 -2
@@ -240,8 +240,8 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,return -ENOMEM ; } - domain =irq_domain_add_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , - node, &gpcv2_irqchip_data_domain_ops, cd); + domain =irq_domain_create_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , +of_fwnode_handle (node), &gpcv2_irqchip_data_domain_ops, cd);if (!domain) {iounmap (cd->gpc_base);kfree (cd);
drivers/irqchip/irq-imx-intmux.c +1 -1
@@ -254,7 +254,7 @@ static int imx_intmux_probe(struct platform_device *pdev) goto out; } - domain =irq_domain_add_linear (np,32 , &imx_intmux_domain_ops, + domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &imx_intmux_domain_ops, &data->irqchip_data[i]);if (!domain) { ret = -ENOMEM ;
drivers/irqchip/irq-imx-irqsteer.c +1 -1
@@ -212,7 +212,7 @@ static int imx_irqsteer_probe(struct platform_device *pdev)/* steer all IRQs into configured channel */ writel_relaxed (BIT (data->channel), data->regs +CHANCTRL ); - data->domain =irq_domain_add_linear (np, data->reg_num *32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np), data->reg_num *32 , &imx_irqsteer_domain_ops, data);if (!data->domain) {dev_err (&pdev->dev,"failed to create IRQ domain\n" );
drivers/irqchip/irq-ingenic-tcu.c +2 -2
@@ -114,8 +114,8 @@ static int __init ingenic_tcu_irq_init(struct device_node *np, tcu->nb_parent_irqs = irqs; - tcu->domain =irq_domain_add_linear (np,32 , &irq_generic_chip_ops, -NULL ); + tcu->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops, +NULL );if (!tcu->domain) { ret = -ENOMEM ; goto err_free_tcu;
drivers/irqchip/irq-ingenic.c +2 -2
@@ -90,8 +90,8 @@ static int __init ingenic_intc_of_init(struct device_node *node, goto out_unmap_irq; } - domain =irq_domain_add_linear (node, num_chips *32 , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), num_chips *32 , + &irq_generic_chip_ops,NULL );if (!domain) { err = -ENOMEM ; goto out_unmap_base;
drivers/irqchip/irq-jcore-aic.c +2 -3
@@ -107,9 +107,8 @@ static int __init aic_irq_of_init(struct device_node *node,if (ret <0 )return ret; - domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, - &jcore_aic_irqdomain_ops, - &jcore_aic); + domain =irq_domain_create_legacy (of_fwnode_handle (node), dom_sz - min_irq, min_irq, + min_irq, &jcore_aic_irqdomain_ops, &jcore_aic);if (!domain)return -ENOMEM ;
drivers/irqchip/irq-keystone.c +2 -2
@@ -157,8 +157,8 @@ static int keystone_irq_probe(struct platform_device *pdev) kirq->chip.irq_mask = keystone_irq_setmask; kirq->chip.irq_unmask = keystone_irq_unmask; - kirq->irqd =irq_domain_add_linear (np,KEYSTONE_N_IRQ , - &keystone_irq_ops, kirq); + kirq->irqd =irq_domain_create_linear (of_fwnode_handle (np),KEYSTONE_N_IRQ , + &keystone_irq_ops, kirq);if (!kirq->irqd) {dev_err (dev,"IRQ domain registration failed\n" );return -ENODEV ;
drivers/irqchip/irq-lpc32xx.c +2 -2
@@ -210,8 +210,8 @@ static int __init lpc32xx_of_ic_init(struct device_node *node,return -EINVAL ; } - irqc->domain =irq_domain_add_linear (node,NR_LPC32XX_IC_IRQS , - &lpc32xx_irq_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_LPC32XX_IC_IRQS , + &lpc32xx_irq_domain_ops, irqc);if (!irqc->domain) {pr_err ("unable to add irq domain\n" );iounmap (irqc->base);
drivers/irqchip/irq-ls-extirq.c +2 -2
@@ -208,8 +208,8 @@ ls_extirq_of_init(struct device_node *node, struct device_node *parent)of_device_is_compatible (node,"fsl,ls1043a-extirq" );raw_spin_lock_init (&priv->lock); - domain =irq_domain_add_hierarchy (parent_domain,0 , priv->nirq, node, - &extirq_domain_ops, priv); + domain =irq_domain_create_hierarchy (parent_domain,0 , priv->nirq,of_fwnode_handle (node), + &extirq_domain_ops, priv);if (!domain) { ret = -ENOMEM ; goto err_add_hierarchy;
drivers/irqchip/irq-ls-scfg-msi.c +4 -4
@@ -215,10 +215,10 @@ static void ls_scfg_msi_irq_handler(struct irq_desc *desc)static int ls_scfg_msi_domains_init (struct ls_scfg_msi *msi_data) {/* Initialize MSI domain parent */ - msi_data->parent =irq_domain_add_linear (NULL , - msi_data->irqs_num, - &ls_scfg_msi_domain_ops, - msi_data); + msi_data->parent =irq_domain_create_linear (NULL , + msi_data->irqs_num, + &ls_scfg_msi_domain_ops, + msi_data);if (!msi_data->parent) {dev_err (&msi_data->pdev->dev,"failed to create IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ls1x.c +2 -2
@@ -126,8 +126,8 @@ static int __init ls1x_intc_of_init(struct device_node *node, }/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,32 , &irq_generic_chip_ops, -NULL ); + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &irq_generic_chip_ops, +NULL );if (!priv->domain) {pr_err ("ls1x-irq: cannot add IRQ domain\n" ); err = -ENOMEM ;
drivers/irqchip/irq-mchp-eic.c +3 -2
@@ -248,8 +248,9 @@ static int mchp_eic_init(struct device_node *node, struct device_node *parent) eic->irqs[i] = irq.args[1 ]; } - eic->domain =irq_domain_add_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , - node, &mchp_eic_domain_ops, eic); + eic->domain =irq_domain_create_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , +of_fwnode_handle (node), &mchp_eic_domain_ops, + eic);if (!eic->domain) {pr_err ("%pOF: Failed to add domain\n" , node); ret = -ENODEV ;
drivers/irqchip/irq-mips-cpu.c +5 -8
@@ -238,11 +238,9 @@ static void mips_cpu_register_ipi_domain(struct device_node *of_node)struct cpu_ipi_domain_state *ipi_domain_state; ipi_domain_state =kzalloc (sizeof (*ipi_domain_state),GFP_KERNEL ); - ipi_domain =irq_domain_add_hierarchy (irq_domain, -IRQ_DOMAIN_FLAG_IPI_SINGLE , -2 , of_node, - &mips_cpu_ipi_chip_ops, - ipi_domain_state); + ipi_domain =irq_domain_create_hierarchy (irq_domain,IRQ_DOMAIN_FLAG_IPI_SINGLE ,2 , +of_fwnode_handle (of_node), + &mips_cpu_ipi_chip_ops, ipi_domain_state);if (!ipi_domain)panic ("Failed to add MIPS CPU IPI domain" );irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI );
@@ -260,9 +258,8 @@ static void __init __mips_cpu_irq_init(struct device_node *of_node)clear_c0_status (ST0_IM );clear_c0_cause (CAUSEF_IP ); - irq_domain =irq_domain_add_legacy (of_node,8 ,MIPS_CPU_IRQ_BASE ,0 , - &mips_cpu_intc_irq_domain_ops, -NULL ); + irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),8 ,MIPS_CPU_IRQ_BASE ,0 , + &mips_cpu_intc_irq_domain_ops,NULL );if (!irq_domain)panic ("Failed to add irqdomain for MIPS CPU" );
drivers/irqchip/irq-mips-gic.c +8 -7
@@ -841,10 +841,10 @@ static int gic_register_ipi_domain(struct device_node *node)struct irq_domain *gic_ipi_domain;unsigned int v[2 ], num_ipis; - gic_ipi_domain =irq_domain_add_hierarchy (gic_irq_domain, -IRQ_DOMAIN_FLAG_IPI_PER_CPU , -GIC_NUM_LOCAL_INTRS + gic_shared_intrs, - node, &gic_ipi_domain_ops,NULL ); + gic_ipi_domain =irq_domain_create_hierarchy (gic_irq_domain,IRQ_DOMAIN_FLAG_IPI_PER_CPU , +GIC_NUM_LOCAL_INTRS + gic_shared_intrs, +of_fwnode_handle (node), &gic_ipi_domain_ops, +NULL );if (!gic_ipi_domain) {pr_err ("Failed to add IPI domain" );return -ENXIO ;
@@ -963,9 +963,10 @@ static int __init gic_of_init(struct device_node *node, gic_irq_dispatch); } - gic_irq_domain =irq_domain_add_simple (node,GIC_NUM_LOCAL_INTRS + - gic_shared_intrs,0 , - &gic_irq_domain_ops,NULL ); + gic_irq_domain =irq_domain_create_simple (of_fwnode_handle (node), +GIC_NUM_LOCAL_INTRS + + gic_shared_intrs,0 , + &gic_irq_domain_ops,NULL );if (!gic_irq_domain) {pr_err ("Failed to add IRQ domain" );return -ENXIO ;
drivers/irqchip/irq-mmp.c +6 -6
@@ -261,9 +261,9 @@ static int __init mmp_init_bases(struct device_node *node) } icu_data[0 ].virq_base =0 ; - icu_data[0 ].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[0 ]); + icu_data[0 ].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[0 ]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[0 ].domain, irq);if (!ret) {
@@ -391,9 +391,9 @@ static int __init mmp2_mux_of_init(struct device_node *node,return -EINVAL ; icu_data[i].virq_base =0 ; - icu_data[i].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[i]); + icu_data[i].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[i]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[i].domain, irq);if (!ret) {
drivers/irqchip/irq-mscc-ocelot.c +2 -2
@@ -132,8 +132,8 @@ static int __init vcoreiii_irq_init(struct device_node *node,if (!parent_irq)return -EINVAL ; - domain =irq_domain_add_linear (node, p->n_irq, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), p->n_irq, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-mst-intc.c +2 -2
@@ -273,8 +273,8 @@ static int __init mst_intc_of_init(struct device_node *dn,raw_spin_lock_init (&cd->lock); cd->irq_start = irq_start; cd->nr_irqs = irq_end - irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , cd->nr_irqs, dn, - &mst_intc_domain_ops, cd); + domain =irq_domain_create_hierarchy (domain_parent,0 , cd->nr_irqs,of_fwnode_handle (dn), + &mst_intc_domain_ops, cd);if (!domain) {iounmap (cd->base);kfree (cd);
drivers/irqchip/irq-mtk-cirq.c +2 -3
@@ -336,9 +336,8 @@ static int __init mtk_cirq_of_init(struct device_node *node, cirq_data->offsets = match->data; irq_num = cirq_data->ext_irq_end - cirq_data->ext_irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , - irq_num, node, - &cirq_domain_ops, cirq_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , irq_num,of_fwnode_handle (node), + &cirq_domain_ops, cirq_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-mtk-sysirq.c +2 -2
@@ -207,8 +207,8 @@ static int __init mtk_sysirq_of_init(struct device_node *node, chip_data->which_word[i] = word; } - domain =irq_domain_add_hierarchy (domain_parent,0 , intpol_num, node, - &sysirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , intpol_num,of_fwnode_handle (node), + &sysirq_domain_ops, chip_data);if (!domain) { ret = -ENOMEM ; goto out_free_which_word;
drivers/irqchip/irq-mvebu-pic.c +2 -2
@@ -150,8 +150,8 @@ static int mvebu_pic_probe(struct platform_device *pdev)return -EINVAL ; } - pic->domain =irq_domain_add_linear (node,PIC_MAX_IRQS , - &mvebu_pic_domain_ops, pic); + pic->domain =irq_domain_create_linear (of_fwnode_handle (node),PIC_MAX_IRQS , + &mvebu_pic_domain_ops, pic);if (!pic->domain) {dev_err (&pdev->dev,"Failed to allocate irq domain\n" );return -ENOMEM ;
drivers/irqchip/irq-mxs.c +2 -2
@@ -162,8 +162,8 @@ static const struct irq_domain_ops icoll_irq_domain_ops = {static void __init icoll_add_domain (struct device_node *np,int num) { - icoll_domain =irq_domain_add_linear (np, num, - &icoll_irq_domain_ops,NULL ); + icoll_domain =irq_domain_create_linear (of_fwnode_handle (np), num, + &icoll_irq_domain_ops,NULL );if (!icoll_domain)panic ("%pOF: unable to create irq domain" , np);
drivers/irqchip/irq-nvic.c +1 -1
@@ -90,7 +90,7 @@ static int __init nvic_of_init(struct device_node *node, irqs =NVIC_MAX_IRQ ; nvic_irq_domain = -irq_domain_add_linear (node, irqs, &nvic_irq_domain_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node), irqs, &nvic_irq_domain_ops,NULL );if (!nvic_irq_domain) {pr_warn ("Failed to allocate irq domain\n" );
drivers/irqchip/irq-omap-intc.c +2 -2
@@ -248,7 +248,7 @@ static int __init omap_init_irq_of(struct device_node *node)if (WARN_ON (!omap_irq_base))return -ENOMEM ; - domain =irq_domain_add_linear (node, omap_nr_irqs, + domain =irq_domain_create_linear (of_fwnode_handle (node), omap_nr_irqs, &irq_generic_chip_ops,NULL );omap_irq_soft_reset ();
@@ -274,7 +274,7 @@ static int __init omap_init_irq_legacy(u32 base, struct device_node *node) irq_base =0 ; } - domain =irq_domain_add_legacy (node, omap_nr_irqs, irq_base,0 , + domain =irq_domain_create_legacy (of_fwnode_handle (node), omap_nr_irqs, irq_base,0 , &irq_domain_simple_ops,NULL );omap_irq_soft_reset ();
drivers/irqchip/irq-or1k-pic.c +2 -2
@@ -144,8 +144,8 @@ static int __init or1k_pic_init(struct device_node *node,/* Disable all interrupts until explicitly requested */ mtspr (SPR_PICMR , (0UL )); - root_domain =irq_domain_add_linear (node,32 , &or1k_irq_domain_ops, - pic); + root_domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &or1k_irq_domain_ops, + pic);set_handle_irq (or1k_pic_handle_irq);
drivers/irqchip/irq-orion.c +3 -3
@@ -59,7 +59,7 @@ static int __init orion_irq_init(struct device_node *np,/* count number of irq chips by valid reg addresses */ num_chips =of_address_count (np); - orion_irq_domain =irq_domain_add_linear (np, + orion_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), num_chips *ORION_IRQS_PER_CHIP , &irq_generic_chip_ops,NULL );if (!orion_irq_domain)
@@ -146,8 +146,8 @@ static int __init orion_bridge_irq_init(struct device_node *np,/* get optional number of interrupts provided */ of_property_read_u32 (np,"marvell,#interrupts" , &nrirqs); - domain =irq_domain_add_linear (np, nrirqs, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , np);return -ENOMEM ;
drivers/irqchip/irq-owl-sirq.c +2 -2
@@ -323,8 +323,8 @@ static int __init owl_sirq_init(const struct owl_sirq_params *params,owl_sirq_clear_set_extctl (chip_data,0 ,INTC_EXTCTL_CLK_SEL , i); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_SIRQ , node, - &owl_sirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_SIRQ ,of_fwnode_handle (node), + &owl_sirq_domain_ops, chip_data);if (!domain) {pr_err ("%pOF: failed to add domain\n" , node); ret = -ENOMEM ;
drivers/irqchip/irq-pic32-evic.c +3 -3
@@ -227,9 +227,9 @@ static int __init pic32_of_init(struct device_node *node, goto err_iounmap; } - evic_irq_domain =irq_domain_add_linear (node, nchips *32 , - &pic32_irq_domain_ops, - priv); + evic_irq_domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , + &pic32_irq_domain_ops, + priv);if (!evic_irq_domain) { ret = -ENOMEM ; goto err_free_priv;
drivers/irqchip/irq-pruss-intc.c +2 -2
@@ -555,8 +555,8 @@ static int pruss_intc_probe(struct platform_device *pdev)mutex_init (&intc->lock); - intc->domain =irq_domain_add_linear (dev->of_node, max_system_events, - &pruss_intc_irq_domain_ops, intc); + intc->domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), max_system_events, + &pruss_intc_irq_domain_ops, intc);if (!intc->domain)return -ENOMEM ;
drivers/irqchip/irq-realtek-rtl.c +1 -1
@@ -162,7 +162,7 @@ static int __init realtek_rtl_of_init(struct device_node *node, struct device_noelse if (!parent_irq)return -ENODEV ; - domain =irq_domain_add_linear (node,RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL );if (!domain)return -ENOMEM ;
drivers/irqchip/irq-renesas-intc-irqpin.c +4 -2
@@ -513,8 +513,10 @@ static int intc_irqpin_probe(struct platform_device *pdev) irq_chip->irq_set_wake = intc_irqpin_irq_set_wake; irq_chip->flags =IRQCHIP_MASK_ON_SUSPEND ; - p->irq_domain =irq_domain_add_simple (dev->of_node, nirqs,0 , - &intc_irqpin_irq_domain_ops, p); + p->irq_domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node), + nirqs,0 , + &intc_irqpin_irq_domain_ops, + p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-irqc.c +2 -2
@@ -168,8 +168,8 @@ static int irqc_probe(struct platform_device *pdev) p->cpu_int_base = p->iomem +IRQC_INT_CPU_BASE (0 );/* SYS-SPI */ - p->irq_domain =irq_domain_add_linear (dev->of_node, p->number_of_irqs, - &irq_generic_chip_ops, p); + p->irq_domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), p->number_of_irqs, + &irq_generic_chip_ops, p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-rza1.c +3 -3
@@ -231,9 +231,9 @@ static int rza1_irqc_probe(struct platform_device *pdev) priv->chip.irq_set_type = rza1_irqc_set_type; priv->chip.flags =IRQCHIP_MASK_ON_SUSPEND |IRQCHIP_SKIP_SET_WAKE ; - priv->irq_domain =irq_domain_add_hierarchy (parent,0 ,IRQC_NUM_IRQ , - np, &rza1_irqc_domain_ops, - priv); + priv->irq_domain =irq_domain_create_hierarchy (parent,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (np), &rza1_irqc_domain_ops, + priv);if (!priv->irq_domain) {dev_err (dev,"cannot initialize irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-renesas-rzg2l.c +3 -3
@@ -574,9 +574,9 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node *raw_spin_lock_init (&rzg2l_irqc_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , - node, &rzg2l_irqc_domain_ops, - rzg2l_irqc_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (node), &rzg2l_irqc_domain_ops, + rzg2l_irqc_data);if (!irq_domain) {pm_runtime_put (dev);return dev_err_probe (dev, -ENOMEM ,"failed to add irq domain\n" );
drivers/irqchip/irq-renesas-rzv2h.c +3 -2
@@ -514,8 +514,9 @@ static int rzv2h_icu_init_common(struct device_node *node, struct device_node *praw_spin_lock_init (&rzv2h_icu_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , node, - &rzv2h_icu_domain_ops, rzv2h_icu_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , +of_fwnode_handle (node), &rzv2h_icu_domain_ops, + rzv2h_icu_data);if (!irq_domain) {dev_err (&pdev->dev,"failed to add irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-sa11x0.c +1 -1
@@ -162,7 +162,7 @@ void __init sa11x0_init_irq_nodt(int irq_start, resource_size_t io_start)*/ writel_relaxed (1 , iobase +ICCR ); - sa1100_normal_irqdomain =irq_domain_add_simple (NULL , + sa1100_normal_irqdomain =irq_domain_create_simple (NULL ,32 , irq_start, &sa1100_normal_irqdomain_ops,NULL );
drivers/irqchip/irq-sni-exiu.c +2 -2
@@ -253,8 +253,8 @@ static int __init exiu_dt_init(struct device_node *node,if (IS_ERR (data))return PTR_ERR (data); - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_IRQS , node, - &exiu_domain_ops, data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_IRQS ,of_fwnode_handle (node), + &exiu_domain_ops, data);if (!domain) {pr_err ("%pOF: failed to allocate domain\n" , node); goto out_unmap;
drivers/irqchip/irq-sp7021-intc.c +2 -2
@@ -256,8 +256,8 @@ static int __init sp_intc_init_dt(struct device_node *node, struct device_node *writel_relaxed (~0 ,REG_INTR_CLEAR + i *4 ); } - sp_intc.domain =irq_domain_add_linear (node,SP_INTC_NR_IRQS , - &sp_intc_dm_ops, &sp_intc); + sp_intc.domain =irq_domain_create_linear (of_fwnode_handle (node),SP_INTC_NR_IRQS , + &sp_intc_dm_ops, &sp_intc);if (!sp_intc.domain) { ret = -ENOMEM ; goto out_unmap1;
drivers/irqchip/irq-starfive-jh8100-intc.c +2 -2
@@ -158,8 +158,8 @@ static int __init starfive_intc_init(struct device_node *intc,raw_spin_lock_init (&irqc->lock); - irqc->domain =irq_domain_add_linear (intc,STARFIVE_INTC_SRC_IRQ_NUM , - &starfive_intc_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (intc),STARFIVE_INTC_SRC_IRQ_NUM , + &starfive_intc_domain_ops, irqc);if (!irqc->domain) {pr_err ("Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-stm32-exti.c +2 -2
@@ -344,8 +344,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data,if (!host_data)return -ENOMEM ; - domain =irq_domain_add_linear (node, drv_data->bank_nr *IRQS_PER_BANK , - &irq_exti_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), drv_data->bank_nr *IRQS_PER_BANK , + &irq_exti_domain_ops,NULL );if (!domain) {pr_err ("%pOFn: Could not register interrupt domain.\n" , node);
drivers/irqchip/irq-stm32mp-exti.c +3 -4
@@ -682,10 +682,9 @@ static int stm32mp_exti_probe(struct platform_device *pdev)return -EINVAL ; } - domain =irq_domain_add_hierarchy (parent_domain,0 , - drv_data->bank_nr *IRQS_PER_BANK , - np, &stm32mp_exti_domain_ops, - host_data); + domain =irq_domain_create_hierarchy (parent_domain,0 , drv_data->bank_nr *IRQS_PER_BANK , +of_fwnode_handle (np), &stm32mp_exti_domain_ops, + host_data);if (!domain) {dev_err (dev,"Could not register exti domain\n" );
drivers/irqchip/irq-sun4i.c +1 -1
@@ -133,7 +133,7 @@ static int __init sun4i_of_init(struct device_node *node,/* Configure the external interrupt source type */ writel (0x00 , irq_ic_data->irq_base +SUN4I_IRQ_NMI_CTRL_REG ); - irq_ic_data->irq_domain =irq_domain_add_linear (node,3 *32 , + irq_ic_data->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),3 *32 , &sun4i_irq_ops,NULL );if (!irq_ic_data->irq_domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-sun6i-r.c +2 -2
@@ -338,8 +338,8 @@ static int __init sun6i_r_intc_init(struct device_node *node,return PTR_ERR (base); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 , node, - &sun6i_r_intc_domain_ops,NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 ,of_fwnode_handle (node), + &sun6i_r_intc_domain_ops,NULL );if (!domain) {pr_err ("%pOF: Failed to allocate domain\n" , node);iounmap (base);
drivers/irqchip/irq-sunxi-nmi.c +1 -1
@@ -159,7 +159,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,struct irq_domain *domain;int ret; - domain =irq_domain_add_linear (node,1 , &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),1 , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Could not register interrupt domain.\n" );return -ENOMEM ;
drivers/irqchip/irq-tb10x.c +4 -4
@@ -121,13 +121,13 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, goto ioremap_fail; } - domain =irq_domain_add_linear (ictl,AB_IRQCTL_MAXIRQ , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (ictl),AB_IRQCTL_MAXIRQ , + &irq_generic_chip_ops,NULL );if (!domain) { ret = -ENOMEM ;pr_err ("%pOFn: Could not register interrupt domain.\n" , ictl); - goto irq_domain_add_fail; + goto irq_domain_create_fail; } ret = irq_alloc_domain_generic_chips(domain, AB_IRQCTL_MAXIRQ,
@@ -174,7 +174,7 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, gc_alloc_fail:irq_domain_remove (domain); -irq_domain_add_fail: +irq_domain_create_fail:iounmap (reg_base); ioremap_fail:release_mem_region (mem.start,resource_size (&mem));
drivers/irqchip/irq-tegra.c +2 -3
@@ -330,9 +330,8 @@ static int __init tegra_ictlr_init(struct device_node *node, node, num_ictlrs, soc->num_ictlrs); - domain =irq_domain_add_hierarchy (parent_domain,0 , num_ictlrs *32 , - node, &tegra_ictlr_domain_ops, - lic); + domain =irq_domain_create_hierarchy (parent_domain,0 , num_ictlrs *32 , +of_fwnode_handle (node), &tegra_ictlr_domain_ops, lic);if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node); err = -ENOMEM ;
drivers/irqchip/irq-ti-sci-inta.c +3 -3
@@ -701,9 +701,9 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)if (ret)return ret; - domain =irq_domain_add_linear (dev_of_node (dev), -ti_sci_get_num_resources (inta->vint), - &ti_sci_inta_irq_domain_ops, inta); + domain =irq_domain_create_linear (of_fwnode_handle (dev_of_node (dev)), +ti_sci_get_num_resources (inta->vint), + &ti_sci_inta_irq_domain_ops, inta);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ti-sci-intr.c +3 -2
@@ -274,8 +274,9 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)return PTR_ERR (intr->out_irqs); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 ,dev_of_node (dev), - &ti_sci_intr_irq_domain_ops, intr); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 , +of_fwnode_handle (dev_of_node (dev)), + &ti_sci_intr_irq_domain_ops, intr);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ts4800.c +1 -1
@@ -125,7 +125,7 @@ static int ts4800_ic_probe(struct platform_device *pdev)return -EINVAL ; } - data->domain =irq_domain_add_linear (node,8 , &ts4800_ic_ops, data); + data->domain =irq_domain_create_linear (of_fwnode_handle (node),8 , &ts4800_ic_ops, data);if (!data->domain) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-versatile-fpga.c +2 -2
@@ -176,8 +176,8 @@ static void __init fpga_irq_init(void __iomem *base, int parent_irq, f); } - f->domain =irq_domain_add_linear (node,fls (valid), - &fpga_irqdomain_ops, f); + f->domain =irq_domain_create_linear (of_fwnode_handle (node),fls (valid), + &fpga_irqdomain_ops, f);/* This will allocate all valid descriptors in the linear case */ for (i =0 ; i <fls (valid); i++)
drivers/irqchip/irq-vf610-mscm-ir.c +3 -3
@@ -209,9 +209,9 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node,regmap_read (mscm_cp_regmap, MSCM_CPxNUM, &cpuid); mscm_ir_data->cpu_mask =0x1 << cpuid; - domain =irq_domain_add_hierarchy (domain_parent,0 , -MSCM_IRSPRC_NUM , node, - &mscm_irq_domain_ops, mscm_ir_data); + domain =irq_domain_create_hierarchy (domain_parent,0 ,MSCM_IRSPRC_NUM , +of_fwnode_handle (node), &mscm_irq_domain_ops, + mscm_ir_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-vic.c +3 -2
@@ -289,8 +289,9 @@ static void __init vic_register(void __iomem *base, unsigned int parent_irq, vic_handle_irq_cascaded, v); } - v->domain =irq_domain_add_simple (node,fls (valid_sources), irq, - &vic_irqdomain_ops, v); + v->domain =irq_domain_create_simple (of_fwnode_handle (node), +fls (valid_sources), irq, + &vic_irqdomain_ops, v);/* create an IRQ mapping for each valid IRQ */ for (i =0 ; i <fls (valid_sources); i++)if (valid_sources & (1 << i))
drivers/irqchip/irq-wpcm450-aic.c +1 -1
@@ -154,7 +154,7 @@ static int __init wpcm450_aic_of_init(struct device_node *node,set_handle_irq (wpcm450_aic_handle_irq); - aic->domain =irq_domain_add_linear (node,AIC_NUM_IRQS , &wpcm450_aic_ops, aic); + aic->domain =irq_domain_create_linear (of_fwnode_handle (node),AIC_NUM_IRQS , &wpcm450_aic_ops, aic);return 0 ; }
drivers/irqchip/irq-xilinx-intc.c +2 -2
@@ -212,8 +212,8 @@ static int __init xilinx_intc_of_init(struct device_node *intc,xintc_write (irqc,MER ,MER_HIE |MER_ME ); } - irqc->root_domain =irq_domain_add_linear (intc, irqc->nr_irq, - &xintc_irq_domain_ops, irqc); + irqc->root_domain =irq_domain_create_linear (of_fwnode_handle (intc), irqc->nr_irq, + &xintc_irq_domain_ops, irqc);if (!irqc->root_domain) {pr_err ("irq-xilinx: Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-xtensa-mx.c +2 -3
@@ -167,8 +167,7 @@ static void __init xtensa_mx_init_common(struct irq_domain *root_domain)int __init xtensa_mx_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , - &xtensa_mx_irq_domain_ops, +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
@@ -178,7 +177,7 @@ static int __init xtensa_mx_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_mx_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
drivers/irqchip/irq-xtensa-pic.c +2 -2
@@ -85,7 +85,7 @@ static struct irq_chip xtensa_irq_chip = {int __init xtensa_pic_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
@@ -95,7 +95,7 @@ static int __init xtensa_pic_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
drivers/irqchip/irq-zevio.c +2 -2
@@ -92,8 +92,8 @@ static int __init zevio_of_init(struct device_node *node,zevio_init_irq_base (zevio_irq_io +IO_IRQ_BASE );zevio_init_irq_base (zevio_irq_io +IO_FIQ_BASE ); - zevio_irq_domain =irq_domain_add_linear (node,MAX_INTRS , - &irq_generic_chip_ops,NULL ); + zevio_irq_domain =irq_domain_create_linear (of_fwnode_handle (node),MAX_INTRS , + &irq_generic_chip_ops,NULL );BUG_ON (!zevio_irq_domain); ret = irq_alloc_domain_generic_chips(zevio_irq_domain, MAX_INTRS, 1,
drivers/irqchip/spear-shirq.c +1 -1
@@ -239,7 +239,7 @@ static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr, goto err_unmap; } - shirq_domain =irq_domain_add_legacy (np, nr_irqs, virq_base,0 , + shirq_domain =irq_domain_create_legacy (of_fwnode_handle (np), nr_irqs, virq_base,0 , &irq_domain_simple_ops,NULL );if (WARN_ON (!shirq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
[tip: irq/drivers] irqchip/irq-vt8500: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/drivers branch of tip:
The following commit has been merged into the irq/drivers branch of tip:
Commit-ID: 15568ffd59d4e7d8c39286a7159880afe327216d Gitweb: https://git.kernel.org/tip/15568ffd59d4e7d8c39286a7159880afe327216d Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:14 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 15:36:56 +02:00
irqchip/irq-vt8500: 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: Split out from combo patch to avoid merge conflicts ]
--- drivers/irqchip/irq-vt8500.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/irqchip/irq-vt8500.c +2 -4
@@ -214,10 +214,8 @@ static int __init vt8500_irq_init(struct device_node *node, goto err_free; } - intc->domain =irq_domain_add_linear (node, -64 , - &vt8500_irq_domain_ops, - intc); + intc->domain =irq_domain_create_linear (of_fwnode_handle (node),64 , + &vt8500_irq_domain_ops, intc);if (!intc->domain) {pr_err ("%s: Unable to add irq domain!\n" , __func__); ret = -ENOMEM ;
[tip: irq/cleanups] irqchip: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: affdc0d1bdfa544fed26ae07c4e136af86465507 Gitweb: https://git.kernel.org/tip/affdc0d1bdfa544fed26ae07c4e136af86465507 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:14 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:09 +02:00
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 ]
--- drivers/irqchip/exynos-combiner.c | 2 +- drivers/irqchip/irq-al-fic.c | 2 +- drivers/irqchip/irq-alpine-msi.c | 5 ++--- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-aspeed-i2c-ic.c | 2 +- drivers/irqchip/irq-aspeed-intc.c | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 2 +- drivers/irqchip/irq-aspeed-vic.c | 4 ++-- drivers/irqchip/irq-ath79-misc.c | 4 ++-- drivers/irqchip/irq-atmel-aic-common.c | 2 +- drivers/irqchip/irq-bcm2712-mip.c | 4 ++-- drivers/irqchip/irq-bcm2835.c | 2 +- drivers/irqchip/irq-bcm2836.c | 2 +- drivers/irqchip/irq-bcm6345-l1.c | 2 +- drivers/irqchip/irq-bcm7038-l1.c | 2 +- drivers/irqchip/irq-bcm7120-l2.c | 2 +- drivers/irqchip/irq-brcmstb-l2.c | 2 +- drivers/irqchip/irq-clps711x.c | 4 ++-- drivers/irqchip/irq-crossbar.c | 6 ++---- drivers/irqchip/irq-csky-apb-intc.c | 2 +- drivers/irqchip/irq-csky-mpintc.c | 2 +- drivers/irqchip/irq-davinci-cp-intc.c | 6 ++++-- drivers/irqchip/irq-digicolor.c | 2 +- drivers/irqchip/irq-dw-apb-ictl.c | 2 +- drivers/irqchip/irq-ftintc010.c | 5 +++-- drivers/irqchip/irq-goldfish-pic.c | 7 +++---- drivers/irqchip/irq-hip04.c | 6 ++---- drivers/irqchip/irq-i8259.c | 4 ++-- drivers/irqchip/irq-idt3243x.c | 2 +- drivers/irqchip/irq-imgpdc.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 4 ++-- drivers/irqchip/irq-imx-intmux.c | 2 +- drivers/irqchip/irq-imx-irqsteer.c | 2 +- drivers/irqchip/irq-ingenic-tcu.c | 4 ++-- drivers/irqchip/irq-ingenic.c | 4 ++-- drivers/irqchip/irq-jcore-aic.c | 5 ++--- drivers/irqchip/irq-keystone.c | 4 ++-- drivers/irqchip/irq-lpc32xx.c | 4 ++-- drivers/irqchip/irq-ls-extirq.c | 4 ++-- drivers/irqchip/irq-ls-scfg-msi.c | 8 ++++---- drivers/irqchip/irq-ls1x.c | 4 ++-- drivers/irqchip/irq-mchp-eic.c | 5 +++-- drivers/irqchip/irq-mips-cpu.c | 13 +++++-------- drivers/irqchip/irq-mips-gic.c | 15 ++++++++------- drivers/irqchip/irq-mmp.c | 12 ++++++------ drivers/irqchip/irq-mscc-ocelot.c | 4 ++-- drivers/irqchip/irq-mst-intc.c | 4 ++-- drivers/irqchip/irq-mtk-cirq.c | 5 ++--- drivers/irqchip/irq-mtk-sysirq.c | 4 ++-- drivers/irqchip/irq-mvebu-pic.c | 4 ++-- drivers/irqchip/irq-mxs.c | 4 ++-- drivers/irqchip/irq-nvic.c | 2 +- drivers/irqchip/irq-omap-intc.c | 4 ++-- drivers/irqchip/irq-or1k-pic.c | 4 ++-- drivers/irqchip/irq-orion.c | 6 +++--- drivers/irqchip/irq-owl-sirq.c | 4 ++-- drivers/irqchip/irq-pic32-evic.c | 6 +++--- drivers/irqchip/irq-pruss-intc.c | 4 ++-- drivers/irqchip/irq-realtek-rtl.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 6 ++++-- drivers/irqchip/irq-renesas-irqc.c | 4 ++-- drivers/irqchip/irq-renesas-rza1.c | 6 +++--- drivers/irqchip/irq-renesas-rzg2l.c | 6 +++--- drivers/irqchip/irq-renesas-rzv2h.c | 5 +++-- drivers/irqchip/irq-sa11x0.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 4 ++-- drivers/irqchip/irq-sp7021-intc.c | 4 ++-- drivers/irqchip/irq-starfive-jh8100-intc.c | 4 ++-- drivers/irqchip/irq-stm32-exti.c | 4 ++-- drivers/irqchip/irq-stm32mp-exti.c | 7 +++---- drivers/irqchip/irq-sun4i.c | 2 +- drivers/irqchip/irq-sun6i-r.c | 4 ++-- drivers/irqchip/irq-sunxi-nmi.c | 2 +- drivers/irqchip/irq-tb10x.c | 8 ++++---- drivers/irqchip/irq-tegra.c | 5 ++--- drivers/irqchip/irq-ti-sci-inta.c | 6 +++--- drivers/irqchip/irq-ti-sci-intr.c | 5 +++-- drivers/irqchip/irq-ts4800.c | 2 +- drivers/irqchip/irq-versatile-fpga.c | 4 ++-- drivers/irqchip/irq-vf610-mscm-ir.c | 6 +++--- drivers/irqchip/irq-vic.c | 5 +++-- drivers/irqchip/irq-wpcm450-aic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 4 ++-- drivers/irqchip/irq-xtensa-mx.c | 5 ++--- drivers/irqchip/irq-xtensa-pic.c | 4 ++-- drivers/irqchip/irq-zevio.c | 4 ++-- drivers/irqchip/spear-shirq.c | 2 +- 87 files changed, 180 insertions(+), 184 deletions(-)
drivers/irqchip/exynos-combiner.c +1 -1
@@ -180,7 +180,7 @@ static void __init combiner_init(void __iomem *combiner_base,if (!combiner_data)return ; - combiner_irq_domain =irq_domain_add_linear (np, nr_irq, + combiner_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), nr_irq, &combiner_irq_domain_ops, combiner_data);if (WARN_ON (!combiner_irq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
drivers/irqchip/irq-al-fic.c +1 -1
@@ -139,7 +139,7 @@ static int al_fic_register(struct device_node *node,struct irq_chip_generic *gc;int ret; - fic->domain =irq_domain_add_linear (node, + fic->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_FIC_IRQS , &irq_generic_chip_ops, fic);
drivers/irqchip/irq-alpine-msi.c +2 -3
@@ -205,9 +205,8 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENXIO ; } - middle_domain =irq_domain_add_hierarchy (gic_domain,0 ,0 ,NULL , - &alpine_msix_middle_domain_ops, - priv); + middle_domain =irq_domain_create_hierarchy (gic_domain,0 ,0 ,NULL , + &alpine_msix_middle_domain_ops, priv);if (!middle_domain) {pr_err ("Failed to create the MSIX middle domain\n" );return -ENOMEM ;
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -348,7 +348,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node, mpic->msi_doorbell_mask =PCI_MSI_FULL_DOORBELL_MASK ; } - mpic->msi_inner_domain =irq_domain_add_linear (NULL , mpic->msi_doorbell_size, + mpic->msi_inner_domain =irq_domain_create_linear (NULL , mpic->msi_doorbell_size, &mpic_msi_domain_ops, mpic);if (!mpic->msi_inner_domain)return -ENOMEM ;
@@ -861,7 +861,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *parif (!mpic_is_ipi_available (mpic)) nr_irqs =MPIC_PER_CPU_IRQS_NR ; - mpic->domain =irq_domain_add_linear (node, nr_irqs, &mpic_irq_ops, mpic); + mpic->domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, &mpic_irq_ops, mpic);if (!mpic->domain) {pr_err ("%pOF: Unable to add IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-aspeed-i2c-ic.c +1 -1
@@ -82,7 +82,7 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node, goto err_iounmap; } - i2c_ic->irq_domain =irq_domain_add_linear (node,ASPEED_I2C_IC_NUM_BUS , + i2c_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),ASPEED_I2C_IC_NUM_BUS , &aspeed_i2c_ic_irq_domain_ops,NULL );if (!i2c_ic->irq_domain) {
drivers/irqchip/irq-aspeed-intc.c +1 -1
@@ -102,7 +102,7 @@ static int __init aspeed_intc_ic_of_init(struct device_node *node,writel (0xffffffff , intc_ic->base +INTC_INT_STATUS_REG );writel (0x0 , intc_ic->base +INTC_INT_ENABLE_REG ); - intc_ic->irq_domain =irq_domain_add_linear (node,INTC_IRQS_PER_WORD , + intc_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),INTC_IRQS_PER_WORD , &aspeed_intc_ic_irq_domain_ops, intc_ic);if (!intc_ic->irq_domain) { ret = -ENOMEM ;
drivers/irqchip/irq-aspeed-scu-ic.c +1 -1
@@ -165,7 +165,7 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_scu_ic *scu_ic, goto err; } - scu_ic->irq_domain =irq_domain_add_linear (node, scu_ic->num_irqs, + scu_ic->irq_domain =irq_domain_create_linear (of_fwnode_handle (node), scu_ic->num_irqs, &aspeed_scu_ic_domain_ops, scu_ic);if (!scu_ic->irq_domain) {
drivers/irqchip/irq-aspeed-vic.c +2 -2
@@ -211,8 +211,8 @@ static int __init avic_of_init(struct device_node *node,set_handle_irq (avic_handle_irq);/* Register our domain */ - vic->dom =irq_domain_add_simple (node,NUM_IRQS ,0 , - &avic_dom_ops, vic); + vic->dom =irq_domain_create_simple (of_fwnode_handle (node),NUM_IRQS ,0 , + &avic_dom_ops, vic);return 0 ; }
drivers/irqchip/irq-ath79-misc.c +2 -2
@@ -147,7 +147,7 @@ static int __init ath79_misc_intc_of_init(return -ENOMEM ; } - domain =irq_domain_add_linear (node,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_linear (of_fwnode_handle (node),ATH79_MISC_IRQ_COUNT , &misc_irq_domain_ops, base);if (!domain) {pr_err ("Failed to add MISC irqdomain\n" );
@@ -188,7 +188,7 @@ void __init ath79_misc_irq_init(void __iomem *regs, int irq,else ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack; - domain =irq_domain_add_legacy (NULL ,ATH79_MISC_IRQ_COUNT , + domain =irq_domain_create_legacy (NULL ,ATH79_MISC_IRQ_COUNT , irq_base,0 , &misc_irq_domain_ops, regs);if (!domain)panic ("Failed to create MISC irqdomain" );
drivers/irqchip/irq-atmel-aic-common.c +1 -1
@@ -228,7 +228,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node, goto err_iounmap; } - domain =irq_domain_add_linear (node, nchips *32 , ops, aic); + domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , ops, aic);if (!domain) { ret = -ENOMEM ; goto err_free_aic;
drivers/irqchip/irq-bcm2712-mip.c +2 -2
@@ -173,8 +173,8 @@ static int mip_init_domains(struct mip_priv *mip, struct device_node *np) {struct irq_domain *middle; - middle =irq_domain_add_hierarchy (mip->parent,0 , mip->num_msis, np, - &mip_middle_domain_ops, mip); + middle =irq_domain_create_hierarchy (mip->parent,0 , mip->num_msis,of_fwnode_handle (np), + &mip_middle_domain_ops, mip);if (!middle)return -ENOMEM ;
drivers/irqchip/irq-bcm2835.c +1 -1
@@ -144,7 +144,7 @@ static int __init armctrl_of_init(struct device_node *node,if (!base)panic ("%pOF: unable to map IC registers\n" , node); - intc.domain =irq_domain_add_linear (node,MAKE_HWIRQ (NR_BANKS ,0 ), + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),MAKE_HWIRQ (NR_BANKS ,0 ), &armctrl_ops,NULL );if (!intc.domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-bcm2836.c +1 -1
@@ -325,7 +325,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node,bcm2835_init_local_timer_frequency (); - intc.domain =irq_domain_add_linear (node,LAST_IRQ +1 , + intc.domain =irq_domain_create_linear (of_fwnode_handle (node),LAST_IRQ +1 , &bcm2836_arm_irqchip_intc_ops,NULL );if (!intc.domain)
drivers/irqchip/irq-bcm6345-l1.c +1 -1
@@ -316,7 +316,7 @@ static int __init bcm6345_l1_of_init(struct device_node *dn,raw_spin_lock_init (&intc->lock); - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm6345_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7038-l1.c +1 -1
@@ -416,7 +416,7 @@ static int __init bcm7038_l1_of_init(struct device_node *dn, } } - intc->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * intc->n_words, + intc->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * intc->n_words, &bcm7038_l1_domain_ops, intc);if (!intc->domain) {
drivers/irqchip/irq-bcm7120-l2.c +1 -1
@@ -264,7 +264,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, goto out_free_l1_data; } - data->domain =irq_domain_add_linear (dn,IRQS_PER_WORD * data->n_words, + data->domain =irq_domain_create_linear (of_fwnode_handle (dn),IRQS_PER_WORD * data->n_words, &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-brcmstb-l2.c +1 -1
@@ -182,7 +182,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, goto out_unmap; } - data->domain =irq_domain_add_linear (np,32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops,NULL );if (!data->domain) { ret = -ENOMEM ;
drivers/irqchip/irq-clps711x.c +2 -2
@@ -184,8 +184,8 @@ static int __init _clps711x_intc_init(struct device_node *np, clps711x_intc->ops.map = clps711x_intc_irq_map; clps711x_intc->ops.xlate = irq_domain_xlate_onecell; clps711x_intc->domain = -irq_domain_add_legacy (np,ARRAY_SIZE (clps711x_irqs), -0 ,0 , &clps711x_intc->ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (np),ARRAY_SIZE (clps711x_irqs),0 ,0 , + &clps711x_intc->ops,NULL );if (!clps711x_intc->domain) { err = -ENOMEM ; goto out_irqfree;
drivers/irqchip/irq-crossbar.c +2 -4
@@ -351,10 +351,8 @@ static int __init irqcrossbar_init(struct device_node *node,if (err)return err; - domain =irq_domain_add_hierarchy (parent_domain,0 , - cb->max_crossbar_sources, - node, &crossbar_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 , cb->max_crossbar_sources, +of_fwnode_handle (node), &crossbar_domain_ops,NULL );if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-csky-apb-intc.c +1 -1
@@ -114,7 +114,7 @@ ck_intc_init_comm(struct device_node *node, struct device_node *parent)return -EINVAL ; } - root_domain =irq_domain_add_linear (node, nr_irq, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &irq_generic_chip_ops,NULL );if (!root_domain) {pr_err ("C-SKY Intc irq_domain_add failed.\n" );
drivers/irqchip/irq-csky-mpintc.c +1 -1
@@ -255,7 +255,7 @@ csky_mpintc_init(struct device_node *node, struct device_node *parent)writel_relaxed (BIT (0 ), INTCG_base +INTCG_ICTLR ); } - root_domain =irq_domain_add_linear (node, nr_irq, &csky_irqdomain_ops, + root_domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irq, &csky_irqdomain_ops,NULL );if (!root_domain)return -ENXIO ;
drivers/irqchip/irq-davinci-cp-intc.c +4 -2
@@ -204,8 +204,10 @@ static int __init davinci_cp_intc_do_init(struct resource *res, unsigned int numreturn irq_base; } - davinci_cp_intc_irq_domain =irq_domain_add_legacy (node, num_irqs, irq_base,0 , - &davinci_cp_intc_irq_domain_ops,NULL ); + davinci_cp_intc_irq_domain =irq_domain_create_legacy (of_fwnode_handle (node), num_irqs, + irq_base,0 , + &davinci_cp_intc_irq_domain_ops, +NULL );if (!davinci_cp_intc_irq_domain) {pr_err ("%s: unable to create an interrupt domain\n" , __func__);
drivers/irqchip/irq-digicolor.c +1 -1
@@ -95,7 +95,7 @@ static int __init digicolor_of_init(struct device_node *node,regmap_write (ucregs,UC_IRQ_CONTROL ,1 ); digicolor_irq_domain = -irq_domain_add_linear (node,64 , &irq_generic_chip_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node),64 , &irq_generic_chip_ops,NULL );if (!digicolor_irq_domain) {pr_err ("%pOF: unable to create IRQ domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-dw-apb-ictl.c +1 -1
@@ -173,7 +173,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,else nrirqs =fls (readl_relaxed (iobase +APB_INT_ENABLE_L )); - domain =irq_domain_add_linear (np, nrirqs, domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, domain_ops,NULL );if (!domain) {pr_err ("%pOF: unable to add irq domain\n" , np); ret = -ENOMEM ;
drivers/irqchip/irq-ftintc010.c +3 -2
@@ -180,8 +180,9 @@ static int __init ft010_of_init_irq(struct device_node *node,writel (0 ,FT010_IRQ_MASK (f->base));writel (0 ,FT010_FIQ_MASK (f->base)); - f->domain =irq_domain_add_simple (node,FT010_NUM_IRQS ,0 , - &ft010_irqdomain_ops, f); + f->domain =irq_domain_create_simple (of_fwnode_handle (node), +FT010_NUM_IRQS ,0 , + &ft010_irqdomain_ops, f);set_handle_irq (ft010_irqchip_handle_irq);return 0 ;
drivers/irqchip/irq-goldfish-pic.c +3 -4
@@ -101,10 +101,9 @@ static int __init goldfish_pic_of_init(struct device_node *of_node,irq_setup_generic_chip (gc,IRQ_MSK (GFPIC_NR_IRQS ),0 ,IRQ_NOPROBE |IRQ_LEVEL ,0 ); - gfpic->irq_domain =irq_domain_add_legacy (of_node,GFPIC_NR_IRQS , -GFPIC_IRQ_BASE ,0 , - &goldfish_irq_domain_ops, -NULL ); + gfpic->irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),GFPIC_NR_IRQS , +GFPIC_IRQ_BASE ,0 , &goldfish_irq_domain_ops, +NULL );if (!gfpic->irq_domain) {pr_err ("Failed to add irqdomain!\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-hip04.c +2 -4
@@ -386,10 +386,8 @@ hip04_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - hip04_data.domain =irq_domain_add_legacy (node, nr_irqs, irq_base, -0 , - &hip04_irq_domain_ops, - &hip04_data); + hip04_data.domain =irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &hip04_irq_domain_ops, &hip04_data);if (WARN_ON (!hip04_data.domain))return -EINVAL ;
drivers/irqchip/irq-i8259.c +2 -2
@@ -313,8 +313,8 @@ struct irq_domain * __init __init_i8259_irqs(struct device_node *node)init_8259A (0 ); - domain =irq_domain_add_legacy (node,16 ,I8259A_IRQ_BASE ,0 , - &i8259A_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (node),16 ,I8259A_IRQ_BASE ,0 , + &i8259A_ops,NULL );if (!domain)panic ("Failed to add i8259 IRQ domain" );
drivers/irqchip/irq-idt3243x.c +1 -1
@@ -72,7 +72,7 @@ static int idt_pic_init(struct device_node *of_node, struct device_node *parent) goto out_unmap_irq; } - domain =irq_domain_add_linear (of_node,IDT_PIC_NR_IRQS , + domain =irq_domain_create_linear (of_fwnode_handle (of_node),IDT_PIC_NR_IRQS , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Failed to add irqdomain!\n" );
drivers/irqchip/irq-imgpdc.c +1 -1
@@ -372,7 +372,7 @@ static int pdc_intc_probe(struct platform_device *pdev) priv->syswake_irq = irq;/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,16 , &irq_generic_chip_ops, + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),16 , &irq_generic_chip_ops, priv);if (unlikely (!priv->domain)) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );
drivers/irqchip/irq-imx-gpcv2.c +2 -2
@@ -240,8 +240,8 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,return -ENOMEM ; } - domain =irq_domain_add_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , - node, &gpcv2_irqchip_data_domain_ops, cd); + domain =irq_domain_create_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , +of_fwnode_handle (node), &gpcv2_irqchip_data_domain_ops, cd);if (!domain) {iounmap (cd->gpc_base);kfree (cd);
drivers/irqchip/irq-imx-intmux.c +1 -1
@@ -254,7 +254,7 @@ static int imx_intmux_probe(struct platform_device *pdev) goto out; } - domain =irq_domain_add_linear (np,32 , &imx_intmux_domain_ops, + domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &imx_intmux_domain_ops, &data->irqchip_data[i]);if (!domain) { ret = -ENOMEM ;
drivers/irqchip/irq-imx-irqsteer.c +1 -1
@@ -212,7 +212,7 @@ static int imx_irqsteer_probe(struct platform_device *pdev)/* steer all IRQs into configured channel */ writel_relaxed (BIT (data->channel), data->regs +CHANCTRL ); - data->domain =irq_domain_add_linear (np, data->reg_num *32 , + data->domain =irq_domain_create_linear (of_fwnode_handle (np), data->reg_num *32 , &imx_irqsteer_domain_ops, data);if (!data->domain) {dev_err (&pdev->dev,"failed to create IRQ domain\n" );
drivers/irqchip/irq-ingenic-tcu.c +2 -2
@@ -114,8 +114,8 @@ static int __init ingenic_tcu_irq_init(struct device_node *np, tcu->nb_parent_irqs = irqs; - tcu->domain =irq_domain_add_linear (np,32 , &irq_generic_chip_ops, -NULL ); + tcu->domain =irq_domain_create_linear (of_fwnode_handle (np),32 , &irq_generic_chip_ops, +NULL );if (!tcu->domain) { ret = -ENOMEM ; goto err_free_tcu;
drivers/irqchip/irq-ingenic.c +2 -2
@@ -90,8 +90,8 @@ static int __init ingenic_intc_of_init(struct device_node *node, goto out_unmap_irq; } - domain =irq_domain_add_linear (node, num_chips *32 , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), num_chips *32 , + &irq_generic_chip_ops,NULL );if (!domain) { err = -ENOMEM ; goto out_unmap_base;
drivers/irqchip/irq-jcore-aic.c +2 -3
@@ -107,9 +107,8 @@ static int __init aic_irq_of_init(struct device_node *node,if (ret <0 )return ret; - domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, - &jcore_aic_irqdomain_ops, - &jcore_aic); + domain =irq_domain_create_legacy (of_fwnode_handle (node), dom_sz - min_irq, min_irq, + min_irq, &jcore_aic_irqdomain_ops, &jcore_aic);if (!domain)return -ENOMEM ;
drivers/irqchip/irq-keystone.c +2 -2
@@ -157,8 +157,8 @@ static int keystone_irq_probe(struct platform_device *pdev) kirq->chip.irq_mask = keystone_irq_setmask; kirq->chip.irq_unmask = keystone_irq_unmask; - kirq->irqd =irq_domain_add_linear (np,KEYSTONE_N_IRQ , - &keystone_irq_ops, kirq); + kirq->irqd =irq_domain_create_linear (of_fwnode_handle (np),KEYSTONE_N_IRQ , + &keystone_irq_ops, kirq);if (!kirq->irqd) {dev_err (dev,"IRQ domain registration failed\n" );return -ENODEV ;
drivers/irqchip/irq-lpc32xx.c +2 -2
@@ -210,8 +210,8 @@ static int __init lpc32xx_of_ic_init(struct device_node *node,return -EINVAL ; } - irqc->domain =irq_domain_add_linear (node,NR_LPC32XX_IC_IRQS , - &lpc32xx_irq_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (node),NR_LPC32XX_IC_IRQS , + &lpc32xx_irq_domain_ops, irqc);if (!irqc->domain) {pr_err ("unable to add irq domain\n" );iounmap (irqc->base);
drivers/irqchip/irq-ls-extirq.c +2 -2
@@ -208,8 +208,8 @@ ls_extirq_of_init(struct device_node *node, struct device_node *parent)of_device_is_compatible (node,"fsl,ls1043a-extirq" );raw_spin_lock_init (&priv->lock); - domain =irq_domain_add_hierarchy (parent_domain,0 , priv->nirq, node, - &extirq_domain_ops, priv); + domain =irq_domain_create_hierarchy (parent_domain,0 , priv->nirq,of_fwnode_handle (node), + &extirq_domain_ops, priv);if (!domain) { ret = -ENOMEM ; goto err_add_hierarchy;
drivers/irqchip/irq-ls-scfg-msi.c +4 -4
@@ -215,10 +215,10 @@ static void ls_scfg_msi_irq_handler(struct irq_desc *desc)static int ls_scfg_msi_domains_init (struct ls_scfg_msi *msi_data) {/* Initialize MSI domain parent */ - msi_data->parent =irq_domain_add_linear (NULL , - msi_data->irqs_num, - &ls_scfg_msi_domain_ops, - msi_data); + msi_data->parent =irq_domain_create_linear (NULL , + msi_data->irqs_num, + &ls_scfg_msi_domain_ops, + msi_data);if (!msi_data->parent) {dev_err (&msi_data->pdev->dev,"failed to create IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ls1x.c +2 -2
@@ -126,8 +126,8 @@ static int __init ls1x_intc_of_init(struct device_node *node, }/* Set up an IRQ domain */ - priv->domain =irq_domain_add_linear (node,32 , &irq_generic_chip_ops, -NULL ); + priv->domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &irq_generic_chip_ops, +NULL );if (!priv->domain) {pr_err ("ls1x-irq: cannot add IRQ domain\n" ); err = -ENOMEM ;
drivers/irqchip/irq-mchp-eic.c +3 -2
@@ -248,8 +248,9 @@ static int mchp_eic_init(struct device_node *node, struct device_node *parent) eic->irqs[i] = irq.args[1 ]; } - eic->domain =irq_domain_add_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , - node, &mchp_eic_domain_ops, eic); + eic->domain =irq_domain_create_hierarchy (parent_domain,0 ,MCHP_EIC_NIRQ , +of_fwnode_handle (node), &mchp_eic_domain_ops, + eic);if (!eic->domain) {pr_err ("%pOF: Failed to add domain\n" , node); ret = -ENODEV ;
drivers/irqchip/irq-mips-cpu.c +5 -8
@@ -238,11 +238,9 @@ static void mips_cpu_register_ipi_domain(struct device_node *of_node)struct cpu_ipi_domain_state *ipi_domain_state; ipi_domain_state =kzalloc (sizeof (*ipi_domain_state),GFP_KERNEL ); - ipi_domain =irq_domain_add_hierarchy (irq_domain, -IRQ_DOMAIN_FLAG_IPI_SINGLE , -2 , of_node, - &mips_cpu_ipi_chip_ops, - ipi_domain_state); + ipi_domain =irq_domain_create_hierarchy (irq_domain,IRQ_DOMAIN_FLAG_IPI_SINGLE ,2 , +of_fwnode_handle (of_node), + &mips_cpu_ipi_chip_ops, ipi_domain_state);if (!ipi_domain)panic ("Failed to add MIPS CPU IPI domain" );irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI );
@@ -260,9 +258,8 @@ static void __init __mips_cpu_irq_init(struct device_node *of_node)clear_c0_status (ST0_IM );clear_c0_cause (CAUSEF_IP ); - irq_domain =irq_domain_add_legacy (of_node,8 ,MIPS_CPU_IRQ_BASE ,0 , - &mips_cpu_intc_irq_domain_ops, -NULL ); + irq_domain =irq_domain_create_legacy (of_fwnode_handle (of_node),8 ,MIPS_CPU_IRQ_BASE ,0 , + &mips_cpu_intc_irq_domain_ops,NULL );if (!irq_domain)panic ("Failed to add irqdomain for MIPS CPU" );
drivers/irqchip/irq-mips-gic.c +8 -7
@@ -841,10 +841,10 @@ static int gic_register_ipi_domain(struct device_node *node)struct irq_domain *gic_ipi_domain;unsigned int v[2 ], num_ipis; - gic_ipi_domain =irq_domain_add_hierarchy (gic_irq_domain, -IRQ_DOMAIN_FLAG_IPI_PER_CPU , -GIC_NUM_LOCAL_INTRS + gic_shared_intrs, - node, &gic_ipi_domain_ops,NULL ); + gic_ipi_domain =irq_domain_create_hierarchy (gic_irq_domain,IRQ_DOMAIN_FLAG_IPI_PER_CPU , +GIC_NUM_LOCAL_INTRS + gic_shared_intrs, +of_fwnode_handle (node), &gic_ipi_domain_ops, +NULL );if (!gic_ipi_domain) {pr_err ("Failed to add IPI domain" );return -ENXIO ;
@@ -963,9 +963,10 @@ static int __init gic_of_init(struct device_node *node, gic_irq_dispatch); } - gic_irq_domain =irq_domain_add_simple (node,GIC_NUM_LOCAL_INTRS + - gic_shared_intrs,0 , - &gic_irq_domain_ops,NULL ); + gic_irq_domain =irq_domain_create_simple (of_fwnode_handle (node), +GIC_NUM_LOCAL_INTRS + + gic_shared_intrs,0 , + &gic_irq_domain_ops,NULL );if (!gic_irq_domain) {pr_err ("Failed to add IRQ domain" );return -ENXIO ;
drivers/irqchip/irq-mmp.c +6 -6
@@ -261,9 +261,9 @@ static int __init mmp_init_bases(struct device_node *node) } icu_data[0 ].virq_base =0 ; - icu_data[0 ].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[0 ]); + icu_data[0 ].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[0 ]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[0 ].domain, irq);if (!ret) {
@@ -391,9 +391,9 @@ static int __init mmp2_mux_of_init(struct device_node *node,return -EINVAL ; icu_data[i].virq_base =0 ; - icu_data[i].domain =irq_domain_add_linear (node, nr_irqs, - &mmp_irq_domain_ops, - &icu_data[i]); + icu_data[i].domain =irq_domain_create_linear (of_fwnode_handle (node), nr_irqs, + &mmp_irq_domain_ops, + &icu_data[i]);for (irq =0 ; irq < nr_irqs; irq++) { ret =irq_create_mapping (icu_data[i].domain, irq);if (!ret) {
drivers/irqchip/irq-mscc-ocelot.c +2 -2
@@ -132,8 +132,8 @@ static int __init vcoreiii_irq_init(struct device_node *node,if (!parent_irq)return -EINVAL ; - domain =irq_domain_add_linear (node, p->n_irq, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), p->n_irq, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , node);return -ENOMEM ;
drivers/irqchip/irq-mst-intc.c +2 -2
@@ -273,8 +273,8 @@ static int __init mst_intc_of_init(struct device_node *dn,raw_spin_lock_init (&cd->lock); cd->irq_start = irq_start; cd->nr_irqs = irq_end - irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , cd->nr_irqs, dn, - &mst_intc_domain_ops, cd); + domain =irq_domain_create_hierarchy (domain_parent,0 , cd->nr_irqs,of_fwnode_handle (dn), + &mst_intc_domain_ops, cd);if (!domain) {iounmap (cd->base);kfree (cd);
drivers/irqchip/irq-mtk-cirq.c +2 -3
@@ -336,9 +336,8 @@ static int __init mtk_cirq_of_init(struct device_node *node, cirq_data->offsets = match->data; irq_num = cirq_data->ext_irq_end - cirq_data->ext_irq_start +1 ; - domain =irq_domain_add_hierarchy (domain_parent,0 , - irq_num, node, - &cirq_domain_ops, cirq_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , irq_num,of_fwnode_handle (node), + &cirq_domain_ops, cirq_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-mtk-sysirq.c +2 -2
@@ -207,8 +207,8 @@ static int __init mtk_sysirq_of_init(struct device_node *node, chip_data->which_word[i] = word; } - domain =irq_domain_add_hierarchy (domain_parent,0 , intpol_num, node, - &sysirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (domain_parent,0 , intpol_num,of_fwnode_handle (node), + &sysirq_domain_ops, chip_data);if (!domain) { ret = -ENOMEM ; goto out_free_which_word;
drivers/irqchip/irq-mvebu-pic.c +2 -2
@@ -150,8 +150,8 @@ static int mvebu_pic_probe(struct platform_device *pdev)return -EINVAL ; } - pic->domain =irq_domain_add_linear (node,PIC_MAX_IRQS , - &mvebu_pic_domain_ops, pic); + pic->domain =irq_domain_create_linear (of_fwnode_handle (node),PIC_MAX_IRQS , + &mvebu_pic_domain_ops, pic);if (!pic->domain) {dev_err (&pdev->dev,"Failed to allocate irq domain\n" );return -ENOMEM ;
drivers/irqchip/irq-mxs.c +2 -2
@@ -162,8 +162,8 @@ static const struct irq_domain_ops icoll_irq_domain_ops = {static void __init icoll_add_domain (struct device_node *np,int num) { - icoll_domain =irq_domain_add_linear (np, num, - &icoll_irq_domain_ops,NULL ); + icoll_domain =irq_domain_create_linear (of_fwnode_handle (np), num, + &icoll_irq_domain_ops,NULL );if (!icoll_domain)panic ("%pOF: unable to create irq domain" , np);
drivers/irqchip/irq-nvic.c +1 -1
@@ -90,7 +90,7 @@ static int __init nvic_of_init(struct device_node *node, irqs =NVIC_MAX_IRQ ; nvic_irq_domain = -irq_domain_add_linear (node, irqs, &nvic_irq_domain_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (node), irqs, &nvic_irq_domain_ops,NULL );if (!nvic_irq_domain) {pr_warn ("Failed to allocate irq domain\n" );
drivers/irqchip/irq-omap-intc.c +2 -2
@@ -248,7 +248,7 @@ static int __init omap_init_irq_of(struct device_node *node)if (WARN_ON (!omap_irq_base))return -ENOMEM ; - domain =irq_domain_add_linear (node, omap_nr_irqs, + domain =irq_domain_create_linear (of_fwnode_handle (node), omap_nr_irqs, &irq_generic_chip_ops,NULL );omap_irq_soft_reset ();
@@ -274,7 +274,7 @@ static int __init omap_init_irq_legacy(u32 base, struct device_node *node) irq_base =0 ; } - domain =irq_domain_add_legacy (node, omap_nr_irqs, irq_base,0 , + domain =irq_domain_create_legacy (of_fwnode_handle (node), omap_nr_irqs, irq_base,0 , &irq_domain_simple_ops,NULL );omap_irq_soft_reset ();
drivers/irqchip/irq-or1k-pic.c +2 -2
@@ -144,8 +144,8 @@ static int __init or1k_pic_init(struct device_node *node,/* Disable all interrupts until explicitly requested */ mtspr (SPR_PICMR , (0UL )); - root_domain =irq_domain_add_linear (node,32 , &or1k_irq_domain_ops, - pic); + root_domain =irq_domain_create_linear (of_fwnode_handle (node),32 , &or1k_irq_domain_ops, + pic);set_handle_irq (or1k_pic_handle_irq);
drivers/irqchip/irq-orion.c +3 -3
@@ -59,7 +59,7 @@ static int __init orion_irq_init(struct device_node *np,/* count number of irq chips by valid reg addresses */ num_chips =of_address_count (np); - orion_irq_domain =irq_domain_add_linear (np, + orion_irq_domain =irq_domain_create_linear (of_fwnode_handle (np), num_chips *ORION_IRQS_PER_CHIP , &irq_generic_chip_ops,NULL );if (!orion_irq_domain)
@@ -146,8 +146,8 @@ static int __init orion_bridge_irq_init(struct device_node *np,/* get optional number of interrupts provided */ of_property_read_u32 (np,"marvell,#interrupts" , &nrirqs); - domain =irq_domain_add_linear (np, nrirqs, - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (np), nrirqs, + &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("%pOFn: unable to add irq domain\n" , np);return -ENOMEM ;
drivers/irqchip/irq-owl-sirq.c +2 -2
@@ -323,8 +323,8 @@ static int __init owl_sirq_init(const struct owl_sirq_params *params,owl_sirq_clear_set_extctl (chip_data,0 ,INTC_EXTCTL_CLK_SEL , i); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_SIRQ , node, - &owl_sirq_domain_ops, chip_data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_SIRQ ,of_fwnode_handle (node), + &owl_sirq_domain_ops, chip_data);if (!domain) {pr_err ("%pOF: failed to add domain\n" , node); ret = -ENOMEM ;
drivers/irqchip/irq-pic32-evic.c +3 -3
@@ -227,9 +227,9 @@ static int __init pic32_of_init(struct device_node *node, goto err_iounmap; } - evic_irq_domain =irq_domain_add_linear (node, nchips *32 , - &pic32_irq_domain_ops, - priv); + evic_irq_domain =irq_domain_create_linear (of_fwnode_handle (node), nchips *32 , + &pic32_irq_domain_ops, + priv);if (!evic_irq_domain) { ret = -ENOMEM ; goto err_free_priv;
drivers/irqchip/irq-pruss-intc.c +2 -2
@@ -555,8 +555,8 @@ static int pruss_intc_probe(struct platform_device *pdev)mutex_init (&intc->lock); - intc->domain =irq_domain_add_linear (dev->of_node, max_system_events, - &pruss_intc_irq_domain_ops, intc); + intc->domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), max_system_events, + &pruss_intc_irq_domain_ops, intc);if (!intc->domain)return -ENOMEM ;
drivers/irqchip/irq-realtek-rtl.c +1 -1
@@ -162,7 +162,7 @@ static int __init realtek_rtl_of_init(struct device_node *node, struct device_noelse if (!parent_irq)return -ENODEV ; - domain =irq_domain_add_linear (node,RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),RTL_ICTL_NUM_INPUTS , &irq_domain_ops,NULL );if (!domain)return -ENOMEM ;
drivers/irqchip/irq-renesas-intc-irqpin.c +4 -2
@@ -513,8 +513,10 @@ static int intc_irqpin_probe(struct platform_device *pdev) irq_chip->irq_set_wake = intc_irqpin_irq_set_wake; irq_chip->flags =IRQCHIP_MASK_ON_SUSPEND ; - p->irq_domain =irq_domain_add_simple (dev->of_node, nirqs,0 , - &intc_irqpin_irq_domain_ops, p); + p->irq_domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node), + nirqs,0 , + &intc_irqpin_irq_domain_ops, + p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-irqc.c +2 -2
@@ -168,8 +168,8 @@ static int irqc_probe(struct platform_device *pdev) p->cpu_int_base = p->iomem +IRQC_INT_CPU_BASE (0 );/* SYS-SPI */ - p->irq_domain =irq_domain_add_linear (dev->of_node, p->number_of_irqs, - &irq_generic_chip_ops, p); + p->irq_domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node), p->number_of_irqs, + &irq_generic_chip_ops, p);if (!p->irq_domain) { ret = -ENXIO ;dev_err (dev,"cannot initialize irq domain\n" );
drivers/irqchip/irq-renesas-rza1.c +3 -3
@@ -231,9 +231,9 @@ static int rza1_irqc_probe(struct platform_device *pdev) priv->chip.irq_set_type = rza1_irqc_set_type; priv->chip.flags =IRQCHIP_MASK_ON_SUSPEND |IRQCHIP_SKIP_SET_WAKE ; - priv->irq_domain =irq_domain_add_hierarchy (parent,0 ,IRQC_NUM_IRQ , - np, &rza1_irqc_domain_ops, - priv); + priv->irq_domain =irq_domain_create_hierarchy (parent,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (np), &rza1_irqc_domain_ops, + priv);if (!priv->irq_domain) {dev_err (dev,"cannot initialize irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-renesas-rzg2l.c +3 -3
@@ -574,9 +574,9 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node *raw_spin_lock_init (&rzg2l_irqc_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , - node, &rzg2l_irqc_domain_ops, - rzg2l_irqc_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,IRQC_NUM_IRQ , +of_fwnode_handle (node), &rzg2l_irqc_domain_ops, + rzg2l_irqc_data);if (!irq_domain) {pm_runtime_put (dev);return dev_err_probe (dev, -ENOMEM ,"failed to add irq domain\n" );
drivers/irqchip/irq-renesas-rzv2h.c +3 -2
@@ -514,8 +514,9 @@ static int rzv2h_icu_init_common(struct device_node *node, struct device_node *praw_spin_lock_init (&rzv2h_icu_data->lock); - irq_domain =irq_domain_add_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , node, - &rzv2h_icu_domain_ops, rzv2h_icu_data); + irq_domain =irq_domain_create_hierarchy (parent_domain,0 ,ICU_NUM_IRQ , +of_fwnode_handle (node), &rzv2h_icu_domain_ops, + rzv2h_icu_data);if (!irq_domain) {dev_err (&pdev->dev,"failed to add irq domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-sa11x0.c +1 -1
@@ -162,7 +162,7 @@ void __init sa11x0_init_irq_nodt(int irq_start, resource_size_t io_start)*/ writel_relaxed (1 , iobase +ICCR ); - sa1100_normal_irqdomain =irq_domain_add_simple (NULL , + sa1100_normal_irqdomain =irq_domain_create_simple (NULL ,32 , irq_start, &sa1100_normal_irqdomain_ops,NULL );
drivers/irqchip/irq-sni-exiu.c +2 -2
@@ -253,8 +253,8 @@ static int __init exiu_dt_init(struct device_node *node,if (IS_ERR (data))return PTR_ERR (data); - domain =irq_domain_add_hierarchy (parent_domain,0 ,NUM_IRQS , node, - &exiu_domain_ops, data); + domain =irq_domain_create_hierarchy (parent_domain,0 ,NUM_IRQS ,of_fwnode_handle (node), + &exiu_domain_ops, data);if (!domain) {pr_err ("%pOF: failed to allocate domain\n" , node); goto out_unmap;
drivers/irqchip/irq-sp7021-intc.c +2 -2
@@ -256,8 +256,8 @@ static int __init sp_intc_init_dt(struct device_node *node, struct device_node *writel_relaxed (~0 ,REG_INTR_CLEAR + i *4 ); } - sp_intc.domain =irq_domain_add_linear (node,SP_INTC_NR_IRQS , - &sp_intc_dm_ops, &sp_intc); + sp_intc.domain =irq_domain_create_linear (of_fwnode_handle (node),SP_INTC_NR_IRQS , + &sp_intc_dm_ops, &sp_intc);if (!sp_intc.domain) { ret = -ENOMEM ; goto out_unmap1;
drivers/irqchip/irq-starfive-jh8100-intc.c +2 -2
@@ -158,8 +158,8 @@ static int __init starfive_intc_init(struct device_node *intc,raw_spin_lock_init (&irqc->lock); - irqc->domain =irq_domain_add_linear (intc,STARFIVE_INTC_SRC_IRQ_NUM , - &starfive_intc_domain_ops, irqc); + irqc->domain =irq_domain_create_linear (of_fwnode_handle (intc),STARFIVE_INTC_SRC_IRQ_NUM , + &starfive_intc_domain_ops, irqc);if (!irqc->domain) {pr_err ("Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-stm32-exti.c +2 -2
@@ -344,8 +344,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data,if (!host_data)return -ENOMEM ; - domain =irq_domain_add_linear (node, drv_data->bank_nr *IRQS_PER_BANK , - &irq_exti_domain_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node), drv_data->bank_nr *IRQS_PER_BANK , + &irq_exti_domain_ops,NULL );if (!domain) {pr_err ("%pOFn: Could not register interrupt domain.\n" , node);
drivers/irqchip/irq-stm32mp-exti.c +3 -4
@@ -682,10 +682,9 @@ static int stm32mp_exti_probe(struct platform_device *pdev)return -EINVAL ; } - domain =irq_domain_add_hierarchy (parent_domain,0 , - drv_data->bank_nr *IRQS_PER_BANK , - np, &stm32mp_exti_domain_ops, - host_data); + domain =irq_domain_create_hierarchy (parent_domain,0 , drv_data->bank_nr *IRQS_PER_BANK , +of_fwnode_handle (np), &stm32mp_exti_domain_ops, + host_data);if (!domain) {dev_err (dev,"Could not register exti domain\n" );
drivers/irqchip/irq-sun4i.c +1 -1
@@ -133,7 +133,7 @@ static int __init sun4i_of_init(struct device_node *node,/* Configure the external interrupt source type */ writel (0x00 , irq_ic_data->irq_base +SUN4I_IRQ_NMI_CTRL_REG ); - irq_ic_data->irq_domain =irq_domain_add_linear (node,3 *32 , + irq_ic_data->irq_domain =irq_domain_create_linear (of_fwnode_handle (node),3 *32 , &sun4i_irq_ops,NULL );if (!irq_ic_data->irq_domain)panic ("%pOF: unable to create IRQ domain\n" , node);
drivers/irqchip/irq-sun6i-r.c +2 -2
@@ -338,8 +338,8 @@ static int __init sun6i_r_intc_init(struct device_node *node,return PTR_ERR (base); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 , node, - &sun6i_r_intc_domain_ops,NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 ,of_fwnode_handle (node), + &sun6i_r_intc_domain_ops,NULL );if (!domain) {pr_err ("%pOF: Failed to allocate domain\n" , node);iounmap (base);
drivers/irqchip/irq-sunxi-nmi.c +1 -1
@@ -159,7 +159,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,struct irq_domain *domain;int ret; - domain =irq_domain_add_linear (node,1 , &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (node),1 , &irq_generic_chip_ops,NULL );if (!domain) {pr_err ("Could not register interrupt domain.\n" );return -ENOMEM ;
drivers/irqchip/irq-tb10x.c +4 -4
@@ -121,13 +121,13 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, goto ioremap_fail; } - domain =irq_domain_add_linear (ictl,AB_IRQCTL_MAXIRQ , - &irq_generic_chip_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (ictl),AB_IRQCTL_MAXIRQ , + &irq_generic_chip_ops,NULL );if (!domain) { ret = -ENOMEM ;pr_err ("%pOFn: Could not register interrupt domain.\n" , ictl); - goto irq_domain_add_fail; + goto irq_domain_create_fail; } ret = irq_alloc_domain_generic_chips(domain, AB_IRQCTL_MAXIRQ,
@@ -174,7 +174,7 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, gc_alloc_fail:irq_domain_remove (domain); -irq_domain_add_fail: +irq_domain_create_fail:iounmap (reg_base); ioremap_fail:release_mem_region (mem.start,resource_size (&mem));
drivers/irqchip/irq-tegra.c +2 -3
@@ -330,9 +330,8 @@ static int __init tegra_ictlr_init(struct device_node *node, node, num_ictlrs, soc->num_ictlrs); - domain =irq_domain_add_hierarchy (parent_domain,0 , num_ictlrs *32 , - node, &tegra_ictlr_domain_ops, - lic); + domain =irq_domain_create_hierarchy (parent_domain,0 , num_ictlrs *32 , +of_fwnode_handle (node), &tegra_ictlr_domain_ops, lic);if (!domain) {pr_err ("%pOF: failed to allocated domain\n" , node); err = -ENOMEM ;
drivers/irqchip/irq-ti-sci-inta.c +3 -3
@@ -701,9 +701,9 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)if (ret)return ret; - domain =irq_domain_add_linear (dev_of_node (dev), -ti_sci_get_num_resources (inta->vint), - &ti_sci_inta_irq_domain_ops, inta); + domain =irq_domain_create_linear (of_fwnode_handle (dev_of_node (dev)), +ti_sci_get_num_resources (inta->vint), + &ti_sci_inta_irq_domain_ops, inta);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ti-sci-intr.c +3 -2
@@ -274,8 +274,9 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)return PTR_ERR (intr->out_irqs); } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 ,dev_of_node (dev), - &ti_sci_intr_irq_domain_ops, intr); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 , +of_fwnode_handle (dev_of_node (dev)), + &ti_sci_intr_irq_domain_ops, intr);if (!domain) {dev_err (dev,"Failed to allocate IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-ts4800.c +1 -1
@@ -125,7 +125,7 @@ static int ts4800_ic_probe(struct platform_device *pdev)return -EINVAL ; } - data->domain =irq_domain_add_linear (node,8 , &ts4800_ic_ops, data); + data->domain =irq_domain_create_linear (of_fwnode_handle (node),8 , &ts4800_ic_ops, data);if (!data->domain) {dev_err (&pdev->dev,"cannot add IRQ domain\n" );return -ENOMEM ;
drivers/irqchip/irq-versatile-fpga.c +2 -2
@@ -176,8 +176,8 @@ static void __init fpga_irq_init(void __iomem *base, int parent_irq, f); } - f->domain =irq_domain_add_linear (node,fls (valid), - &fpga_irqdomain_ops, f); + f->domain =irq_domain_create_linear (of_fwnode_handle (node),fls (valid), + &fpga_irqdomain_ops, f);/* This will allocate all valid descriptors in the linear case */ for (i =0 ; i <fls (valid); i++)
drivers/irqchip/irq-vf610-mscm-ir.c +3 -3
@@ -209,9 +209,9 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node,regmap_read (mscm_cp_regmap, MSCM_CPxNUM, &cpuid); mscm_ir_data->cpu_mask =0x1 << cpuid; - domain =irq_domain_add_hierarchy (domain_parent,0 , -MSCM_IRSPRC_NUM , node, - &mscm_irq_domain_ops, mscm_ir_data); + domain =irq_domain_create_hierarchy (domain_parent,0 ,MSCM_IRSPRC_NUM , +of_fwnode_handle (node), &mscm_irq_domain_ops, + mscm_ir_data);if (!domain) { ret = -ENOMEM ; goto out_unmap;
drivers/irqchip/irq-vic.c +3 -2
@@ -289,8 +289,9 @@ static void __init vic_register(void __iomem *base, unsigned int parent_irq, vic_handle_irq_cascaded, v); } - v->domain =irq_domain_add_simple (node,fls (valid_sources), irq, - &vic_irqdomain_ops, v); + v->domain =irq_domain_create_simple (of_fwnode_handle (node), +fls (valid_sources), irq, + &vic_irqdomain_ops, v);/* create an IRQ mapping for each valid IRQ */ for (i =0 ; i <fls (valid_sources); i++)if (valid_sources & (1 << i))
drivers/irqchip/irq-wpcm450-aic.c +1 -1
@@ -154,7 +154,7 @@ static int __init wpcm450_aic_of_init(struct device_node *node,set_handle_irq (wpcm450_aic_handle_irq); - aic->domain =irq_domain_add_linear (node,AIC_NUM_IRQS , &wpcm450_aic_ops, aic); + aic->domain =irq_domain_create_linear (of_fwnode_handle (node),AIC_NUM_IRQS , &wpcm450_aic_ops, aic);return 0 ; }
drivers/irqchip/irq-xilinx-intc.c +2 -2
@@ -212,8 +212,8 @@ static int __init xilinx_intc_of_init(struct device_node *intc,xintc_write (irqc,MER ,MER_HIE |MER_ME ); } - irqc->root_domain =irq_domain_add_linear (intc, irqc->nr_irq, - &xintc_irq_domain_ops, irqc); + irqc->root_domain =irq_domain_create_linear (of_fwnode_handle (intc), irqc->nr_irq, + &xintc_irq_domain_ops, irqc);if (!irqc->root_domain) {pr_err ("irq-xilinx: Unable to create IRQ domain\n" ); ret = -EINVAL ;
drivers/irqchip/irq-xtensa-mx.c +2 -3
@@ -167,8 +167,7 @@ static void __init xtensa_mx_init_common(struct irq_domain *root_domain)int __init xtensa_mx_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , - &xtensa_mx_irq_domain_ops, +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
@@ -178,7 +177,7 @@ static int __init xtensa_mx_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_mx_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip);xtensa_mx_init_common (root_domain);return 0 ;
drivers/irqchip/irq-xtensa-pic.c +2 -2
@@ -85,7 +85,7 @@ static struct irq_chip xtensa_irq_chip = {int __init xtensa_pic_init_legacy (struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , +irq_domain_create_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
@@ -95,7 +95,7 @@ static int __init xtensa_pic_init(struct device_node *np, struct device_node *interrupt_parent) {struct irq_domain *root_domain = -irq_domain_add_linear (np,NR_IRQS , &xtensa_irq_domain_ops, +irq_domain_create_linear (of_fwnode_handle (np),NR_IRQS , &xtensa_irq_domain_ops, &xtensa_irq_chip);irq_set_default_domain (root_domain);return 0 ;
drivers/irqchip/irq-zevio.c +2 -2
@@ -92,8 +92,8 @@ static int __init zevio_of_init(struct device_node *node,zevio_init_irq_base (zevio_irq_io +IO_IRQ_BASE );zevio_init_irq_base (zevio_irq_io +IO_FIQ_BASE ); - zevio_irq_domain =irq_domain_add_linear (node,MAX_INTRS , - &irq_generic_chip_ops,NULL ); + zevio_irq_domain =irq_domain_create_linear (of_fwnode_handle (node),MAX_INTRS , + &irq_generic_chip_ops,NULL );BUG_ON (!zevio_irq_domain); ret = irq_alloc_domain_generic_chips(zevio_irq_domain, MAX_INTRS, 1,
drivers/irqchip/spear-shirq.c +1 -1
@@ -239,7 +239,7 @@ static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr, goto err_unmap; } - shirq_domain =irq_domain_add_legacy (np, nr_irqs, virq_base,0 , + shirq_domain =irq_domain_create_legacy (of_fwnode_handle (np), nr_irqs, virq_base,0 , &irq_domain_simple_ops,NULL );if (WARN_ON (!shirq_domain)) {pr_warn ("%s: irq domain init failed\n" , __func__);
PATCH v2 22/57 irqdomain: mailbox: Switch to irq_domain_create_tree()
In reply to Jiri Slaby (SUSE)irq_domain_add_tree() is going away as being obsolete now. Switch to the preferred irq_domain_create_tree(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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).
--- drivers/mailbox/qcom-ipcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mailbox/qcom-ipcc.c +2 -2
@@ -312,8 +312,8 @@ static int qcom_ipcc_probe(struct platform_device *pdev)if (!name)return -ENOMEM ; - ipcc->irq_domain =irq_domain_add_tree (pdev->dev.of_node, - &qcom_ipcc_irq_ops, ipcc); + ipcc->irq_domain =irq_domain_create_tree (of_fwnode_handle (pdev->dev.of_node), + &qcom_ipcc_irq_ops, ipcc);if (!ipcc->irq_domain)return -ENOMEM ;
Signature · 1 line
2.49.0
[tip: irq/cleanups] mailbox: qcom-ipcc: Switch to irq_domain_create_tree()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 5c50b162e2278df1ed5f27cd33f54b5b8983e414 Gitweb: https://git.kernel.org/tip/5c50b162e2278df1ed5f27cd33f54b5b8983e414 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:15 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:05 +02:00
mailbox: qcom-ipcc: Switch to irq_domain_create_tree()
irq_domain_add_tree() is going away as being obsolete now. Switch to the preferred irq_domain_create_tree(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/mailbox/qcom-ipcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mailbox/qcom-ipcc.c +2 -2
@@ -312,8 +312,8 @@ static int qcom_ipcc_probe(struct platform_device *pdev)if (!name)return -ENOMEM ; - ipcc->irq_domain =irq_domain_add_tree (pdev->dev.of_node, - &qcom_ipcc_irq_ops, ipcc); + ipcc->irq_domain =irq_domain_create_tree (of_fwnode_handle (pdev->dev.of_node), + &qcom_ipcc_irq_ops, ipcc);if (!ipcc->irq_domain)return -ENOMEM ;
[tip: irq/cleanups] mailbox: qcom-ipcc: Switch to irq_domain_create_tree()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 3b585e8bc3cc73bf7d24efbd87e0a0d519f8a19c Gitweb: https://git.kernel.org/tip/3b585e8bc3cc73bf7d24efbd87e0a0d519f8a19c Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:15 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
mailbox: qcom-ipcc: Switch to irq_domain_create_tree()
irq_domain_add_tree() is going away as being obsolete now. Switch to the preferred irq_domain_create_tree(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/mailbox/qcom-ipcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mailbox/qcom-ipcc.c +2 -2
@@ -312,8 +312,8 @@ static int qcom_ipcc_probe(struct platform_device *pdev)if (!name)return -ENOMEM ; - ipcc->irq_domain =irq_domain_add_tree (pdev->dev.of_node, - &qcom_ipcc_irq_ops, ipcc); + ipcc->irq_domain =irq_domain_create_tree (of_fwnode_handle (pdev->dev.of_node), + &qcom_ipcc_irq_ops, ipcc);if (!ipcc->irq_domain)return -ENOMEM ;
[tip: irq/cleanups] mailbox: qcom-ipcc: Switch to irq_domain_create_tree()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: cecd821793e428d3bbd4a6e7f7e6980634c16539 Gitweb: https://git.kernel.org/tip/cecd821793e428d3bbd4a6e7f7e6980634c16539 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:15 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 15:39:39 +02:00
mailbox: qcom-ipcc: Switch to irq_domain_create_tree()
irq_domain_add_tree() is going away as being obsolete now. Switch to the preferred irq_domain_create_tree(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/mailbox/qcom-ipcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mailbox/qcom-ipcc.c +2 -2
@@ -312,8 +312,8 @@ static int qcom_ipcc_probe(struct platform_device *pdev)if (!name)return -ENOMEM ; - ipcc->irq_domain =irq_domain_add_tree (pdev->dev.of_node, - &qcom_ipcc_irq_ops, ipcc); + ipcc->irq_domain =irq_domain_create_tree (of_fwnode_handle (pdev->dev.of_node), + &qcom_ipcc_irq_ops, ipcc);if (!ipcc->irq_domain)return -ENOMEM ;
[tip: irq/cleanups] mailbox: qcom-ipcc: Switch to irq_domain_create_tree()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: b9a7f080e72bb44fe04a4e877077213c854b914a Gitweb: https://git.kernel.org/tip/b9a7f080e72bb44fe04a4e877077213c854b914a Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:15 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:09 +02:00
mailbox: qcom-ipcc: Switch to irq_domain_create_tree()
irq_domain_add_tree() is going away as being obsolete now. Switch to the preferred irq_domain_create_tree(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/mailbox/qcom-ipcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mailbox/qcom-ipcc.c +2 -2
@@ -312,8 +312,8 @@ static int qcom_ipcc_probe(struct platform_device *pdev)if (!name)return -ENOMEM ; - ipcc->irq_domain =irq_domain_add_tree (pdev->dev.of_node, - &qcom_ipcc_irq_ops, ipcc); + ipcc->irq_domain =irq_domain_create_tree (of_fwnode_handle (pdev->dev.of_node), + &qcom_ipcc_irq_ops, ipcc);if (!ipcc->irq_domain)return -ENOMEM ;
PATCH v2 23/57 irqdomain: memory: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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).
--- drivers/memory/omap-gpmc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/memory/omap-gpmc.c +2 -4
@@ -1455,10 +1455,8 @@ static int gpmc_setup_irq(struct gpmc_device *gpmc) gpmc->irq_chip.irq_unmask = gpmc_irq_unmask; gpmc->irq_chip.irq_set_type = gpmc_irq_set_type; - gpmc_irq_domain =irq_domain_add_linear (gpmc->dev->of_node, - gpmc->nirqs, - &gpmc_irq_domain_ops, - gpmc); + gpmc_irq_domain =irq_domain_create_linear (of_fwnode_handle (gpmc->dev->of_node), + gpmc->nirqs, &gpmc_irq_domain_ops, gpmc);if (!gpmc_irq_domain) {dev_err (gpmc->dev,"IRQ domain add failed\n" );return -ENODEV ;
Signature · 1 line
2.49.0
[tip: irq/cleanups] memory: omap-gpmc: Switch to irq_domain_create_linear()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 7ea14cd2a528a9b1209be16249807aefd6e81089 Gitweb: https://git.kernel.org/tip/7ea14cd2a528a9b1209be16249807aefd6e81089 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:16 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:05 +02:00
memory: omap-gpmc: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/memory/omap-gpmc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/memory/omap-gpmc.c +2 -4
@@ -1455,10 +1455,8 @@ static int gpmc_setup_irq(struct gpmc_device *gpmc) gpmc->irq_chip.irq_unmask = gpmc_irq_unmask; gpmc->irq_chip.irq_set_type = gpmc_irq_set_type; - gpmc_irq_domain =irq_domain_add_linear (gpmc->dev->of_node, - gpmc->nirqs, - &gpmc_irq_domain_ops, - gpmc); + gpmc_irq_domain =irq_domain_create_linear (of_fwnode_handle (gpmc->dev->of_node), + gpmc->nirqs, &gpmc_irq_domain_ops, gpmc);if (!gpmc_irq_domain) {dev_err (gpmc->dev,"IRQ domain add failed\n" );return -ENODEV ;
[tip: irq/cleanups] memory: omap-gpmc: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: f83433cfaf96a75cc8a272ca67bbcb00752030ae Gitweb: https://git.kernel.org/tip/f83433cfaf96a75cc8a272ca67bbcb00752030ae Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:16 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:23 +02:00
memory: omap-gpmc: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/memory/omap-gpmc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/memory/omap-gpmc.c +2 -4
@@ -1455,10 +1455,8 @@ static int gpmc_setup_irq(struct gpmc_device *gpmc) gpmc->irq_chip.irq_unmask = gpmc_irq_unmask; gpmc->irq_chip.irq_set_type = gpmc_irq_set_type; - gpmc_irq_domain =irq_domain_add_linear (gpmc->dev->of_node, - gpmc->nirqs, - &gpmc_irq_domain_ops, - gpmc); + gpmc_irq_domain =irq_domain_create_linear (of_fwnode_handle (gpmc->dev->of_node), + gpmc->nirqs, &gpmc_irq_domain_ops, gpmc);if (!gpmc_irq_domain) {dev_err (gpmc->dev,"IRQ domain add failed\n" );return -ENODEV ;
[tip: irq/cleanups] memory: omap-gpmc: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 091b1d92f80753dd0b473fa4dbc510b65c8722ff Gitweb: https://git.kernel.org/tip/091b1d92f80753dd0b473fa4dbc510b65c8722ff Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:16 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 15:39:39 +02:00
memory: omap-gpmc: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/memory/omap-gpmc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/memory/omap-gpmc.c +2 -4
@@ -1455,10 +1455,8 @@ static int gpmc_setup_irq(struct gpmc_device *gpmc) gpmc->irq_chip.irq_unmask = gpmc_irq_unmask; gpmc->irq_chip.irq_set_type = gpmc_irq_set_type; - gpmc_irq_domain =irq_domain_add_linear (gpmc->dev->of_node, - gpmc->nirqs, - &gpmc_irq_domain_ops, - gpmc); + gpmc_irq_domain =irq_domain_create_linear (of_fwnode_handle (gpmc->dev->of_node), + gpmc->nirqs, &gpmc_irq_domain_ops, gpmc);if (!gpmc_irq_domain) {dev_err (gpmc->dev,"IRQ domain add failed\n" );return -ENODEV ;
[tip: irq/cleanups] memory: omap-gpmc: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 8529e33bfe98f613dbb6f8e9ad6b94b501b36c98 Gitweb: https://git.kernel.org/tip/8529e33bfe98f613dbb6f8e9ad6b94b501b36c98 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:16 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:10 +02:00
memory: omap-gpmc: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/memory/omap-gpmc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/memory/omap-gpmc.c +2 -4
@@ -1455,10 +1455,8 @@ static int gpmc_setup_irq(struct gpmc_device *gpmc) gpmc->irq_chip.irq_unmask = gpmc_irq_unmask; gpmc->irq_chip.irq_set_type = gpmc_irq_set_type; - gpmc_irq_domain =irq_domain_add_linear (gpmc->dev->of_node, - gpmc->nirqs, - &gpmc_irq_domain_ops, - gpmc); + gpmc_irq_domain =irq_domain_create_linear (of_fwnode_handle (gpmc->dev->of_node), + gpmc->nirqs, &gpmc_irq_domain_ops, gpmc);if (!gpmc_irq_domain) {dev_err (gpmc->dev,"IRQ domain add failed\n" );return -ENODEV ;
PATCH v2 24/57 irqdomain: mfd: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)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).
--- drivers/mfd/88pm860x-core.c | 4 ++-- drivers/mfd/ab8500-core.c | 6 +++--- drivers/mfd/arizona-irq.c | 3 +-- drivers/mfd/db8500-prcmu.c | 6 +++--- drivers/mfd/fsl-imx25-tsadc.c | 5 ++--- drivers/mfd/lp8788-irq.c | 2 +- drivers/mfd/max8925-core.c | 4 ++-- drivers/mfd/max8997-irq.c | 4 ++-- drivers/mfd/max8998-irq.c | 2 +- drivers/mfd/mt6358-irq.c | 6 +++--- drivers/mfd/mt6397-irq.c | 6 ++---- drivers/mfd/qcom-pm8xxx.c | 6 ++---- drivers/mfd/stmfx.c | 2 +- drivers/mfd/stmpe.c | 4 ++-- drivers/mfd/tc3589x.c | 6 +++--- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/twl4030-irq.c | 4 ++-- drivers/mfd/twl6030-irq.c | 5 ++--- drivers/mfd/wm831x-irq.c | 15 ++++++--------- drivers/mfd/wm8994-irq.c | 4 +--- 21 files changed, 43 insertions(+), 55 deletions(-)
drivers/mfd/88pm860x-core.c +2 -2
@@ -624,8 +624,8 @@ static int device_irq_init(struct pm860x_chip *chip, ret = -EBUSY ; goto out; } -irq_domain_add_legacy (node, nr_irqs, chip->irq_base,0 , - &pm860x_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, chip->irq_base,0 , + &pm860x_irq_domain_ops, chip); chip->core_irq = i2c->irq;if (!chip->core_irq) goto out;
drivers/mfd/ab8500-core.c +3 -3
@@ -580,9 +580,9 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np) num_irqs =AB8500_NR_IRQS ;/* If ->irq_base is zero this will give a linear mapping */ - ab8500->domain =irq_domain_add_simple (ab8500->dev->of_node, - num_irqs,0 , - &ab8500_irq_ops, ab8500); + ab8500->domain =irq_domain_create_simple (of_fwnode_handle (ab8500->dev->of_node), + num_irqs,0 , + &ab8500_irq_ops, ab8500);if (!ab8500->domain) {dev_err (ab8500->dev,"Failed to create irqdomain\n" );
drivers/mfd/arizona-irq.c +1 -2
@@ -312,8 +312,7 @@ int arizona_irq_init(struct arizona *arizona) flags |= arizona->pdata.irq_flags;/* Allocate a virtual IRQ domain to distribute to the regmap domains */ - arizona->virq =irq_domain_add_linear (NULL ,2 , &arizona_domain_ops, - arizona); + arizona->virq =irq_domain_create_linear (NULL ,2 , &arizona_domain_ops, arizona);if (!arizona->virq) {dev_err (arizona->dev,"Failed to add core IRQ domain\n" ); ret = -EINVAL ;
drivers/mfd/db8500-prcmu.c +3 -3
@@ -2607,9 +2607,9 @@ static int db8500_irq_init(struct device_node *np) {int i; - db8500_irq_domain =irq_domain_add_simple ( - np,NUM_PRCMU_WAKEUPS ,0 , - &db8500_irq_ops,NULL ); + db8500_irq_domain =irq_domain_create_simple (of_fwnode_handle (np), +NUM_PRCMU_WAKEUPS ,0 , + &db8500_irq_ops,NULL );if (!db8500_irq_domain) {pr_err ("Failed to create irqdomain\n" );
drivers/mfd/fsl-imx25-tsadc.c +2 -3
@@ -65,15 +65,14 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev, struct mx25_tsadc *tsadc) {struct device *dev = &pdev->dev; -struct device_node *np = dev->of_node;int irq; irq =platform_get_irq (pdev,0 );if (irq <0 )return irq; - tsadc->domain =irq_domain_add_simple (np,2 ,0 , &mx25_tsadc_domain_ops, - tsadc); + tsadc->domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node),2 ,0 , + &mx25_tsadc_domain_ops, tsadc);if (!tsadc->domain) {dev_err (dev,"Failed to add irq domain\n" );return -ENOMEM ;
drivers/mfd/lp8788-irq.c +1 -1
@@ -161,7 +161,7 @@ int lp8788_irq_init(struct lp8788 *lp, int irq)return -ENOMEM ; irqd->lp = lp; - irqd->domain =irq_domain_add_linear (lp->dev->of_node,LP8788_INT_MAX , + irqd->domain =irq_domain_create_linear (of_fwnode_handle (lp->dev->of_node),LP8788_INT_MAX , &lp8788_domain_ops, irqd);if (!irqd->domain) {dev_err (lp->dev,"failed to add irq domain err\n" );
drivers/mfd/max8925-core.c +2 -2
@@ -682,8 +682,8 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,return -EBUSY ; } -irq_domain_add_legacy (node,MAX8925_NR_IRQS , chip->irq_base,0 , - &max8925_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node),MAX8925_NR_IRQS , chip->irq_base,0 , + &max8925_irq_domain_ops, chip);/* request irq handler for pmic main irq*/ chip->core_irq = irq;
drivers/mfd/max8997-irq.c +2 -2
@@ -327,8 +327,8 @@ int max8997_irq_init(struct max8997_dev *max8997) true : false; } - domain =irq_domain_add_linear (NULL ,MAX8997_IRQ_NR , - &max8997_irq_domain_ops, max8997); + domain =irq_domain_create_linear (NULL ,MAX8997_IRQ_NR , + &max8997_irq_domain_ops, max8997);if (!domain) {dev_err (max8997->dev,"could not create irq domain\n" );return -ENODEV ;
drivers/mfd/max8998-irq.c +1 -1
@@ -230,7 +230,7 @@ int max8998_irq_init(struct max8998_dev *max8998)max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM1 ,0xff );max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM2 ,0xff ); - domain =irq_domain_add_simple (NULL ,MAX8998_IRQ_NR , + domain =irq_domain_create_simple (NULL ,MAX8998_IRQ_NR , max8998->irq_base, &max8998_irq_domain_ops, max8998);if (!domain) {dev_err (max8998->dev,"could not create irq domain\n" );
drivers/mfd/mt6358-irq.c +3 -3
@@ -272,9 +272,9 @@ int mt6358_irq_init(struct mt6397_chip *chip) irqd->pmic_ints[i].en_reg_shift * j, 0); } - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, - irqd->num_pmic_irqs, - &mt6358_irq_domain_ops, chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), + irqd->num_pmic_irqs, + &mt6358_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"Could not create IRQ domain\n" );return -ENODEV ;
drivers/mfd/mt6397-irq.c +2 -4
@@ -216,10 +216,8 @@ int mt6397_irq_init(struct mt6397_chip *chip)regmap_write (chip->regmap, chip->int_con[2 ],0x0 ); chip->pm_nb.notifier_call = mt6397_irq_pm_notifier; - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, -MT6397_IRQ_NR , - &mt6397_irq_domain_ops, - chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), +MT6397_IRQ_NR , &mt6397_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"could not create irq domain\n" );return -ENOMEM ;
drivers/mfd/qcom-pm8xxx.c +2 -4
@@ -559,10 +559,8 @@ static int pm8xxx_probe(struct platform_device *pdev) chip->pm_irq_data = data;spin_lock_init (&chip->pm_irq_lock); - chip->irqdomain =irq_domain_add_linear (pdev->dev.of_node, - data->num_irqs, - &pm8xxx_irq_domain_ops, - chip); + chip->irqdomain =irq_domain_create_linear (of_fwnode_handle (pdev->dev.of_node), + data->num_irqs, &pm8xxx_irq_domain_ops, chip);if (!chip->irqdomain)return -ENODEV ;
drivers/mfd/stmfx.c +1 -1
@@ -269,7 +269,7 @@ static int stmfx_irq_init(struct i2c_client *client)u32 irqoutpin =0 , irqtrigger;int ret; - stmfx->irq_domain =irq_domain_add_simple (stmfx->dev->of_node, + stmfx->irq_domain =irq_domain_create_simple (of_fwnode_handle (stmfx->dev->of_node),STMFX_REG_IRQ_SRC_MAX ,0 , &stmfx_irq_ops, stmfx);if (!stmfx->irq_domain) {
drivers/mfd/stmpe.c +2 -2
@@ -1219,8 +1219,8 @@ static int stmpe_irq_init(struct stmpe *stmpe, struct device_node *np)int base =0 ;int num_irqs = stmpe->variant->num_irqs; - stmpe->domain =irq_domain_add_simple (np, num_irqs, base, - &stmpe_irq_ops, stmpe); + stmpe->domain =irq_domain_create_simple (of_fwnode_handle (np), num_irqs, + base, &stmpe_irq_ops, stmpe);if (!stmpe->domain) {dev_err (stmpe->dev,"Failed to create irqdomain\n" );return -ENOSYS ;
drivers/mfd/tc3589x.c +3 -3
@@ -234,9 +234,9 @@ static const struct irq_domain_ops tc3589x_irq_ops = {static int tc3589x_irq_init (struct tc3589x *tc3589x,struct device_node *np) { - tc3589x->domain =irq_domain_add_simple ( - np, TC3589x_NR_INTERNAL_IRQS,0 , - &tc3589x_irq_ops, tc3589x); + tc3589x->domain =irq_domain_create_simple (of_fwnode_handle (np), + TC3589x_NR_INTERNAL_IRQS,0 , + &tc3589x_irq_ops, tc3589x);if (!tc3589x->domain) {dev_err (tc3589x->dev,"Failed to create irqdomain\n" );
drivers/mfd/tps65217.c +1 -1
@@ -158,7 +158,7 @@ static int tps65217_irq_init(struct tps65217 *tps, int irq)tps65217_set_bits (tps,TPS65217_REG_INT ,TPS65217_INT_MASK ,TPS65217_INT_MASK ,TPS65217_PROTECT_NONE ); - tps->irq_domain =irq_domain_add_linear (tps->dev->of_node, + tps->irq_domain =irq_domain_create_linear (of_fwnode_handle (tps->dev->of_node),TPS65217_NUM_IRQ , &tps65217_irq_domain_ops, tps);if (!tps->irq_domain) {dev_err (tps->dev,"Could not create IRQ domain\n" );
drivers/mfd/tps6586x.c +1 -1
@@ -363,7 +363,7 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq, new_irq_base =0 ; } - tps6586x->irq_domain =irq_domain_add_simple (tps6586x->dev->of_node, + tps6586x->irq_domain =irq_domain_create_simple (of_fwnode_handle (tps6586x->dev->of_node), irq_num, new_irq_base, &tps6586x_domain_ops, tps6586x);if (!tps6586x->irq_domain) {
drivers/mfd/twl4030-irq.c +2 -2
@@ -691,8 +691,8 @@ int twl4030_init_irq(struct device *dev, int irq_num)return irq_base; } -irq_domain_add_legacy (node, nr_irqs, irq_base,0 , - &irq_domain_simple_ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &irq_domain_simple_ops,NULL ); irq_end = irq_base +TWL4030_CORE_NR_IRQS ;
drivers/mfd/twl6030-irq.c +2 -3
@@ -364,7 +364,6 @@ static const struct of_device_id twl6030_of_match[] __maybe_unused = {int twl6030_init_irq (struct device *dev,int irq_num) { -struct device_node *node = dev->of_node;int nr_irqs;int status;u8 mask[3 ];
@@ -412,8 +411,8 @@ int twl6030_init_irq(struct device *dev, int irq_num) twl6030_irq->irq_mapping_tbl = of_id->data; twl6030_irq->irq_domain = -irq_domain_add_linear (node, nr_irqs, - &twl6030_irq_domain_ops, twl6030_irq); +irq_domain_create_linear (of_fwnode_handle (dev->of_node), nr_irqs, + &twl6030_irq_domain_ops, twl6030_irq);if (!twl6030_irq->irq_domain) {dev_err (dev,"Can't add irq_domain\n" );return -ENOMEM ;
drivers/mfd/wm831x-irq.c +6 -9
@@ -587,16 +587,13 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq) }if (irq_base) - domain =irq_domain_add_legacy (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - irq_base,0 , - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_legacy (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), irq_base,0 , + &wm831x_irq_domain_ops, wm831x);else - domain =irq_domain_add_linear (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_linear (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), &wm831x_irq_domain_ops, + wm831x);if (!domain) {dev_warn (wm831x->dev,"Failed to allocate IRQ domain\n" );
drivers/mfd/wm8994-irq.c +1 -3
@@ -213,9 +213,7 @@ int wm8994_irq_init(struct wm8994 *wm8994)return ret; } - wm8994->edge_irq =irq_domain_add_linear (NULL ,1 , - &wm8994_edge_irq_ops, - wm8994); + wm8994->edge_irq =irq_domain_create_linear (NULL ,1 , &wm8994_edge_irq_ops, wm8994); ret = regmap_add_irq_chip(wm8994->regmap, irq_create_mapping(wm8994->edge_irq,
Signature · 1 line
2.49.0
[tip: irq/cleanups] mfd: Switch to irq_domain_create_*()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 958f885c634f269a86ae88bd0990b94d4f88d847 Gitweb: https://git.kernel.org/tip/958f885c634f269a86ae88bd0990b94d4f88d847 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:17 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:06 +02:00
mfd: 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 ]
--- drivers/mfd/88pm860x-core.c | 4 ++-- drivers/mfd/ab8500-core.c | 6 +++--- drivers/mfd/arizona-irq.c | 3 +-- drivers/mfd/db8500-prcmu.c | 6 +++--- drivers/mfd/fsl-imx25-tsadc.c | 5 ++--- drivers/mfd/lp8788-irq.c | 2 +- drivers/mfd/max8925-core.c | 4 ++-- drivers/mfd/max8997-irq.c | 4 ++-- drivers/mfd/max8998-irq.c | 2 +- drivers/mfd/mt6358-irq.c | 6 +++--- drivers/mfd/mt6397-irq.c | 6 ++---- drivers/mfd/qcom-pm8xxx.c | 6 ++---- drivers/mfd/stmfx.c | 2 +- drivers/mfd/stmpe.c | 4 ++-- drivers/mfd/tc3589x.c | 6 +++--- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/twl4030-irq.c | 4 ++-- drivers/mfd/twl6030-irq.c | 5 ++--- drivers/mfd/wm831x-irq.c | 15 ++++++--------- drivers/mfd/wm8994-irq.c | 4 +--- 21 files changed, 43 insertions(+), 55 deletions(-)
drivers/mfd/88pm860x-core.c +2 -2
@@ -624,8 +624,8 @@ static int device_irq_init(struct pm860x_chip *chip, ret = -EBUSY ; goto out; } -irq_domain_add_legacy (node, nr_irqs, chip->irq_base,0 , - &pm860x_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, chip->irq_base,0 , + &pm860x_irq_domain_ops, chip); chip->core_irq = i2c->irq;if (!chip->core_irq) goto out;
drivers/mfd/ab8500-core.c +3 -3
@@ -580,9 +580,9 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np) num_irqs =AB8500_NR_IRQS ;/* If ->irq_base is zero this will give a linear mapping */ - ab8500->domain =irq_domain_add_simple (ab8500->dev->of_node, - num_irqs,0 , - &ab8500_irq_ops, ab8500); + ab8500->domain =irq_domain_create_simple (of_fwnode_handle (ab8500->dev->of_node), + num_irqs,0 , + &ab8500_irq_ops, ab8500);if (!ab8500->domain) {dev_err (ab8500->dev,"Failed to create irqdomain\n" );
drivers/mfd/arizona-irq.c +1 -2
@@ -312,8 +312,7 @@ int arizona_irq_init(struct arizona *arizona) flags |= arizona->pdata.irq_flags;/* Allocate a virtual IRQ domain to distribute to the regmap domains */ - arizona->virq =irq_domain_add_linear (NULL ,2 , &arizona_domain_ops, - arizona); + arizona->virq =irq_domain_create_linear (NULL ,2 , &arizona_domain_ops, arizona);if (!arizona->virq) {dev_err (arizona->dev,"Failed to add core IRQ domain\n" ); ret = -EINVAL ;
drivers/mfd/db8500-prcmu.c +3 -3
@@ -2607,9 +2607,9 @@ static int db8500_irq_init(struct device_node *np) {int i; - db8500_irq_domain =irq_domain_add_simple ( - np,NUM_PRCMU_WAKEUPS ,0 , - &db8500_irq_ops,NULL ); + db8500_irq_domain =irq_domain_create_simple (of_fwnode_handle (np), +NUM_PRCMU_WAKEUPS ,0 , + &db8500_irq_ops,NULL );if (!db8500_irq_domain) {pr_err ("Failed to create irqdomain\n" );
drivers/mfd/fsl-imx25-tsadc.c +2 -3
@@ -65,15 +65,14 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev, struct mx25_tsadc *tsadc) {struct device *dev = &pdev->dev; -struct device_node *np = dev->of_node;int irq; irq =platform_get_irq (pdev,0 );if (irq <0 )return irq; - tsadc->domain =irq_domain_add_simple (np,2 ,0 , &mx25_tsadc_domain_ops, - tsadc); + tsadc->domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node),2 ,0 , + &mx25_tsadc_domain_ops, tsadc);if (!tsadc->domain) {dev_err (dev,"Failed to add irq domain\n" );return -ENOMEM ;
drivers/mfd/lp8788-irq.c +1 -1
@@ -161,7 +161,7 @@ int lp8788_irq_init(struct lp8788 *lp, int irq)return -ENOMEM ; irqd->lp = lp; - irqd->domain =irq_domain_add_linear (lp->dev->of_node,LP8788_INT_MAX , + irqd->domain =irq_domain_create_linear (of_fwnode_handle (lp->dev->of_node),LP8788_INT_MAX , &lp8788_domain_ops, irqd);if (!irqd->domain) {dev_err (lp->dev,"failed to add irq domain err\n" );
drivers/mfd/max8925-core.c +2 -2
@@ -682,8 +682,8 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,return -EBUSY ; } -irq_domain_add_legacy (node,MAX8925_NR_IRQS , chip->irq_base,0 , - &max8925_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node),MAX8925_NR_IRQS , chip->irq_base,0 , + &max8925_irq_domain_ops, chip);/* request irq handler for pmic main irq*/ chip->core_irq = irq;
drivers/mfd/max8997-irq.c +2 -2
@@ -327,8 +327,8 @@ int max8997_irq_init(struct max8997_dev *max8997) true : false; } - domain =irq_domain_add_linear (NULL ,MAX8997_IRQ_NR , - &max8997_irq_domain_ops, max8997); + domain =irq_domain_create_linear (NULL ,MAX8997_IRQ_NR , + &max8997_irq_domain_ops, max8997);if (!domain) {dev_err (max8997->dev,"could not create irq domain\n" );return -ENODEV ;
drivers/mfd/max8998-irq.c +1 -1
@@ -230,7 +230,7 @@ int max8998_irq_init(struct max8998_dev *max8998)max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM1 ,0xff );max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM2 ,0xff ); - domain =irq_domain_add_simple (NULL ,MAX8998_IRQ_NR , + domain =irq_domain_create_simple (NULL ,MAX8998_IRQ_NR , max8998->irq_base, &max8998_irq_domain_ops, max8998);if (!domain) {dev_err (max8998->dev,"could not create irq domain\n" );
drivers/mfd/mt6358-irq.c +3 -3
@@ -272,9 +272,9 @@ int mt6358_irq_init(struct mt6397_chip *chip) irqd->pmic_ints[i].en_reg_shift * j, 0); } - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, - irqd->num_pmic_irqs, - &mt6358_irq_domain_ops, chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), + irqd->num_pmic_irqs, + &mt6358_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"Could not create IRQ domain\n" );return -ENODEV ;
drivers/mfd/mt6397-irq.c +2 -4
@@ -216,10 +216,8 @@ int mt6397_irq_init(struct mt6397_chip *chip)regmap_write (chip->regmap, chip->int_con[2 ],0x0 ); chip->pm_nb.notifier_call = mt6397_irq_pm_notifier; - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, -MT6397_IRQ_NR , - &mt6397_irq_domain_ops, - chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), +MT6397_IRQ_NR , &mt6397_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"could not create irq domain\n" );return -ENOMEM ;
drivers/mfd/qcom-pm8xxx.c +2 -4
@@ -559,10 +559,8 @@ static int pm8xxx_probe(struct platform_device *pdev) chip->pm_irq_data = data;spin_lock_init (&chip->pm_irq_lock); - chip->irqdomain =irq_domain_add_linear (pdev->dev.of_node, - data->num_irqs, - &pm8xxx_irq_domain_ops, - chip); + chip->irqdomain =irq_domain_create_linear (of_fwnode_handle (pdev->dev.of_node), + data->num_irqs, &pm8xxx_irq_domain_ops, chip);if (!chip->irqdomain)return -ENODEV ;
drivers/mfd/stmfx.c +1 -1
@@ -269,7 +269,7 @@ static int stmfx_irq_init(struct i2c_client *client)u32 irqoutpin =0 , irqtrigger;int ret; - stmfx->irq_domain =irq_domain_add_simple (stmfx->dev->of_node, + stmfx->irq_domain =irq_domain_create_simple (of_fwnode_handle (stmfx->dev->of_node),STMFX_REG_IRQ_SRC_MAX ,0 , &stmfx_irq_ops, stmfx);if (!stmfx->irq_domain) {
drivers/mfd/stmpe.c +2 -2
@@ -1219,8 +1219,8 @@ static int stmpe_irq_init(struct stmpe *stmpe, struct device_node *np)int base =0 ;int num_irqs = stmpe->variant->num_irqs; - stmpe->domain =irq_domain_add_simple (np, num_irqs, base, - &stmpe_irq_ops, stmpe); + stmpe->domain =irq_domain_create_simple (of_fwnode_handle (np), num_irqs, + base, &stmpe_irq_ops, stmpe);if (!stmpe->domain) {dev_err (stmpe->dev,"Failed to create irqdomain\n" );return -ENOSYS ;
drivers/mfd/tc3589x.c +3 -3
@@ -234,9 +234,9 @@ static const struct irq_domain_ops tc3589x_irq_ops = {static int tc3589x_irq_init (struct tc3589x *tc3589x,struct device_node *np) { - tc3589x->domain =irq_domain_add_simple ( - np, TC3589x_NR_INTERNAL_IRQS,0 , - &tc3589x_irq_ops, tc3589x); + tc3589x->domain =irq_domain_create_simple (of_fwnode_handle (np), + TC3589x_NR_INTERNAL_IRQS,0 , + &tc3589x_irq_ops, tc3589x);if (!tc3589x->domain) {dev_err (tc3589x->dev,"Failed to create irqdomain\n" );
drivers/mfd/tps65217.c +1 -1
@@ -158,7 +158,7 @@ static int tps65217_irq_init(struct tps65217 *tps, int irq)tps65217_set_bits (tps,TPS65217_REG_INT ,TPS65217_INT_MASK ,TPS65217_INT_MASK ,TPS65217_PROTECT_NONE ); - tps->irq_domain =irq_domain_add_linear (tps->dev->of_node, + tps->irq_domain =irq_domain_create_linear (of_fwnode_handle (tps->dev->of_node),TPS65217_NUM_IRQ , &tps65217_irq_domain_ops, tps);if (!tps->irq_domain) {dev_err (tps->dev,"Could not create IRQ domain\n" );
drivers/mfd/tps6586x.c +1 -1
@@ -363,7 +363,7 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq, new_irq_base =0 ; } - tps6586x->irq_domain =irq_domain_add_simple (tps6586x->dev->of_node, + tps6586x->irq_domain =irq_domain_create_simple (of_fwnode_handle (tps6586x->dev->of_node), irq_num, new_irq_base, &tps6586x_domain_ops, tps6586x);if (!tps6586x->irq_domain) {
drivers/mfd/twl4030-irq.c +2 -2
@@ -691,8 +691,8 @@ int twl4030_init_irq(struct device *dev, int irq_num)return irq_base; } -irq_domain_add_legacy (node, nr_irqs, irq_base,0 , - &irq_domain_simple_ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &irq_domain_simple_ops,NULL ); irq_end = irq_base +TWL4030_CORE_NR_IRQS ;
drivers/mfd/twl6030-irq.c +2 -3
@@ -364,7 +364,6 @@ static const struct of_device_id twl6030_of_match[] __maybe_unused = {int twl6030_init_irq (struct device *dev,int irq_num) { -struct device_node *node = dev->of_node;int nr_irqs;int status;u8 mask[3 ];
@@ -412,8 +411,8 @@ int twl6030_init_irq(struct device *dev, int irq_num) twl6030_irq->irq_mapping_tbl = of_id->data; twl6030_irq->irq_domain = -irq_domain_add_linear (node, nr_irqs, - &twl6030_irq_domain_ops, twl6030_irq); +irq_domain_create_linear (of_fwnode_handle (dev->of_node), nr_irqs, + &twl6030_irq_domain_ops, twl6030_irq);if (!twl6030_irq->irq_domain) {dev_err (dev,"Can't add irq_domain\n" );return -ENOMEM ;
drivers/mfd/wm831x-irq.c +6 -9
@@ -587,16 +587,13 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq) }if (irq_base) - domain =irq_domain_add_legacy (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - irq_base,0 , - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_legacy (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), irq_base,0 , + &wm831x_irq_domain_ops, wm831x);else - domain =irq_domain_add_linear (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_linear (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), &wm831x_irq_domain_ops, + wm831x);if (!domain) {dev_warn (wm831x->dev,"Failed to allocate IRQ domain\n" );
drivers/mfd/wm8994-irq.c +1 -3
@@ -213,9 +213,7 @@ int wm8994_irq_init(struct wm8994 *wm8994)return ret; } - wm8994->edge_irq =irq_domain_add_linear (NULL ,1 , - &wm8994_edge_irq_ops, - wm8994); + wm8994->edge_irq =irq_domain_create_linear (NULL ,1 , &wm8994_edge_irq_ops, wm8994); ret = regmap_add_irq_chip(wm8994->regmap, irq_create_mapping(wm8994->edge_irq,
[tip: irq/cleanups] mfd: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 884617398bed7f5ab96196b7c101b6ab68d30506 Gitweb: https://git.kernel.org/tip/884617398bed7f5ab96196b7c101b6ab68d30506 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:17 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:23 +02:00
mfd: 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 ]
--- drivers/mfd/88pm860x-core.c | 4 ++-- drivers/mfd/ab8500-core.c | 6 +++--- drivers/mfd/arizona-irq.c | 3 +-- drivers/mfd/db8500-prcmu.c | 6 +++--- drivers/mfd/fsl-imx25-tsadc.c | 5 ++--- drivers/mfd/lp8788-irq.c | 2 +- drivers/mfd/max8925-core.c | 4 ++-- drivers/mfd/max8997-irq.c | 4 ++-- drivers/mfd/max8998-irq.c | 2 +- drivers/mfd/mt6358-irq.c | 6 +++--- drivers/mfd/mt6397-irq.c | 6 ++---- drivers/mfd/qcom-pm8xxx.c | 6 ++---- drivers/mfd/stmfx.c | 2 +- drivers/mfd/stmpe.c | 4 ++-- drivers/mfd/tc3589x.c | 6 +++--- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/twl4030-irq.c | 4 ++-- drivers/mfd/twl6030-irq.c | 5 ++--- drivers/mfd/wm831x-irq.c | 15 ++++++--------- drivers/mfd/wm8994-irq.c | 4 +--- 21 files changed, 43 insertions(+), 55 deletions(-)
drivers/mfd/88pm860x-core.c +2 -2
@@ -624,8 +624,8 @@ static int device_irq_init(struct pm860x_chip *chip, ret = -EBUSY ; goto out; } -irq_domain_add_legacy (node, nr_irqs, chip->irq_base,0 , - &pm860x_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, chip->irq_base,0 , + &pm860x_irq_domain_ops, chip); chip->core_irq = i2c->irq;if (!chip->core_irq) goto out;
drivers/mfd/ab8500-core.c +3 -3
@@ -580,9 +580,9 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np) num_irqs =AB8500_NR_IRQS ;/* If ->irq_base is zero this will give a linear mapping */ - ab8500->domain =irq_domain_add_simple (ab8500->dev->of_node, - num_irqs,0 , - &ab8500_irq_ops, ab8500); + ab8500->domain =irq_domain_create_simple (of_fwnode_handle (ab8500->dev->of_node), + num_irqs,0 , + &ab8500_irq_ops, ab8500);if (!ab8500->domain) {dev_err (ab8500->dev,"Failed to create irqdomain\n" );
drivers/mfd/arizona-irq.c +1 -2
@@ -312,8 +312,7 @@ int arizona_irq_init(struct arizona *arizona) flags |= arizona->pdata.irq_flags;/* Allocate a virtual IRQ domain to distribute to the regmap domains */ - arizona->virq =irq_domain_add_linear (NULL ,2 , &arizona_domain_ops, - arizona); + arizona->virq =irq_domain_create_linear (NULL ,2 , &arizona_domain_ops, arizona);if (!arizona->virq) {dev_err (arizona->dev,"Failed to add core IRQ domain\n" ); ret = -EINVAL ;
drivers/mfd/db8500-prcmu.c +3 -3
@@ -2607,9 +2607,9 @@ static int db8500_irq_init(struct device_node *np) {int i; - db8500_irq_domain =irq_domain_add_simple ( - np,NUM_PRCMU_WAKEUPS ,0 , - &db8500_irq_ops,NULL ); + db8500_irq_domain =irq_domain_create_simple (of_fwnode_handle (np), +NUM_PRCMU_WAKEUPS ,0 , + &db8500_irq_ops,NULL );if (!db8500_irq_domain) {pr_err ("Failed to create irqdomain\n" );
drivers/mfd/fsl-imx25-tsadc.c +2 -3
@@ -65,15 +65,14 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev, struct mx25_tsadc *tsadc) {struct device *dev = &pdev->dev; -struct device_node *np = dev->of_node;int irq; irq =platform_get_irq (pdev,0 );if (irq <0 )return irq; - tsadc->domain =irq_domain_add_simple (np,2 ,0 , &mx25_tsadc_domain_ops, - tsadc); + tsadc->domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node),2 ,0 , + &mx25_tsadc_domain_ops, tsadc);if (!tsadc->domain) {dev_err (dev,"Failed to add irq domain\n" );return -ENOMEM ;
drivers/mfd/lp8788-irq.c +1 -1
@@ -161,7 +161,7 @@ int lp8788_irq_init(struct lp8788 *lp, int irq)return -ENOMEM ; irqd->lp = lp; - irqd->domain =irq_domain_add_linear (lp->dev->of_node,LP8788_INT_MAX , + irqd->domain =irq_domain_create_linear (of_fwnode_handle (lp->dev->of_node),LP8788_INT_MAX , &lp8788_domain_ops, irqd);if (!irqd->domain) {dev_err (lp->dev,"failed to add irq domain err\n" );
drivers/mfd/max8925-core.c +2 -2
@@ -682,8 +682,8 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,return -EBUSY ; } -irq_domain_add_legacy (node,MAX8925_NR_IRQS , chip->irq_base,0 , - &max8925_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node),MAX8925_NR_IRQS , chip->irq_base,0 , + &max8925_irq_domain_ops, chip);/* request irq handler for pmic main irq*/ chip->core_irq = irq;
drivers/mfd/max8997-irq.c +2 -2
@@ -327,8 +327,8 @@ int max8997_irq_init(struct max8997_dev *max8997) true : false; } - domain =irq_domain_add_linear (NULL ,MAX8997_IRQ_NR , - &max8997_irq_domain_ops, max8997); + domain =irq_domain_create_linear (NULL ,MAX8997_IRQ_NR , + &max8997_irq_domain_ops, max8997);if (!domain) {dev_err (max8997->dev,"could not create irq domain\n" );return -ENODEV ;
drivers/mfd/max8998-irq.c +1 -1
@@ -230,7 +230,7 @@ int max8998_irq_init(struct max8998_dev *max8998)max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM1 ,0xff );max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM2 ,0xff ); - domain =irq_domain_add_simple (NULL ,MAX8998_IRQ_NR , + domain =irq_domain_create_simple (NULL ,MAX8998_IRQ_NR , max8998->irq_base, &max8998_irq_domain_ops, max8998);if (!domain) {dev_err (max8998->dev,"could not create irq domain\n" );
drivers/mfd/mt6358-irq.c +3 -3
@@ -272,9 +272,9 @@ int mt6358_irq_init(struct mt6397_chip *chip) irqd->pmic_ints[i].en_reg_shift * j, 0); } - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, - irqd->num_pmic_irqs, - &mt6358_irq_domain_ops, chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), + irqd->num_pmic_irqs, + &mt6358_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"Could not create IRQ domain\n" );return -ENODEV ;
drivers/mfd/mt6397-irq.c +2 -4
@@ -216,10 +216,8 @@ int mt6397_irq_init(struct mt6397_chip *chip)regmap_write (chip->regmap, chip->int_con[2 ],0x0 ); chip->pm_nb.notifier_call = mt6397_irq_pm_notifier; - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, -MT6397_IRQ_NR , - &mt6397_irq_domain_ops, - chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), +MT6397_IRQ_NR , &mt6397_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"could not create irq domain\n" );return -ENOMEM ;
drivers/mfd/qcom-pm8xxx.c +2 -4
@@ -559,10 +559,8 @@ static int pm8xxx_probe(struct platform_device *pdev) chip->pm_irq_data = data;spin_lock_init (&chip->pm_irq_lock); - chip->irqdomain =irq_domain_add_linear (pdev->dev.of_node, - data->num_irqs, - &pm8xxx_irq_domain_ops, - chip); + chip->irqdomain =irq_domain_create_linear (of_fwnode_handle (pdev->dev.of_node), + data->num_irqs, &pm8xxx_irq_domain_ops, chip);if (!chip->irqdomain)return -ENODEV ;
drivers/mfd/stmfx.c +1 -1
@@ -269,7 +269,7 @@ static int stmfx_irq_init(struct i2c_client *client)u32 irqoutpin =0 , irqtrigger;int ret; - stmfx->irq_domain =irq_domain_add_simple (stmfx->dev->of_node, + stmfx->irq_domain =irq_domain_create_simple (of_fwnode_handle (stmfx->dev->of_node),STMFX_REG_IRQ_SRC_MAX ,0 , &stmfx_irq_ops, stmfx);if (!stmfx->irq_domain) {
drivers/mfd/stmpe.c +2 -2
@@ -1219,8 +1219,8 @@ static int stmpe_irq_init(struct stmpe *stmpe, struct device_node *np)int base =0 ;int num_irqs = stmpe->variant->num_irqs; - stmpe->domain =irq_domain_add_simple (np, num_irqs, base, - &stmpe_irq_ops, stmpe); + stmpe->domain =irq_domain_create_simple (of_fwnode_handle (np), num_irqs, + base, &stmpe_irq_ops, stmpe);if (!stmpe->domain) {dev_err (stmpe->dev,"Failed to create irqdomain\n" );return -ENOSYS ;
drivers/mfd/tc3589x.c +3 -3
@@ -234,9 +234,9 @@ static const struct irq_domain_ops tc3589x_irq_ops = {static int tc3589x_irq_init (struct tc3589x *tc3589x,struct device_node *np) { - tc3589x->domain =irq_domain_add_simple ( - np, TC3589x_NR_INTERNAL_IRQS,0 , - &tc3589x_irq_ops, tc3589x); + tc3589x->domain =irq_domain_create_simple (of_fwnode_handle (np), + TC3589x_NR_INTERNAL_IRQS,0 , + &tc3589x_irq_ops, tc3589x);if (!tc3589x->domain) {dev_err (tc3589x->dev,"Failed to create irqdomain\n" );
drivers/mfd/tps65217.c +1 -1
@@ -158,7 +158,7 @@ static int tps65217_irq_init(struct tps65217 *tps, int irq)tps65217_set_bits (tps,TPS65217_REG_INT ,TPS65217_INT_MASK ,TPS65217_INT_MASK ,TPS65217_PROTECT_NONE ); - tps->irq_domain =irq_domain_add_linear (tps->dev->of_node, + tps->irq_domain =irq_domain_create_linear (of_fwnode_handle (tps->dev->of_node),TPS65217_NUM_IRQ , &tps65217_irq_domain_ops, tps);if (!tps->irq_domain) {dev_err (tps->dev,"Could not create IRQ domain\n" );
drivers/mfd/tps6586x.c +1 -1
@@ -363,7 +363,7 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq, new_irq_base =0 ; } - tps6586x->irq_domain =irq_domain_add_simple (tps6586x->dev->of_node, + tps6586x->irq_domain =irq_domain_create_simple (of_fwnode_handle (tps6586x->dev->of_node), irq_num, new_irq_base, &tps6586x_domain_ops, tps6586x);if (!tps6586x->irq_domain) {
drivers/mfd/twl4030-irq.c +2 -2
@@ -691,8 +691,8 @@ int twl4030_init_irq(struct device *dev, int irq_num)return irq_base; } -irq_domain_add_legacy (node, nr_irqs, irq_base,0 , - &irq_domain_simple_ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &irq_domain_simple_ops,NULL ); irq_end = irq_base +TWL4030_CORE_NR_IRQS ;
drivers/mfd/twl6030-irq.c +2 -3
@@ -364,7 +364,6 @@ static const struct of_device_id twl6030_of_match[] __maybe_unused = {int twl6030_init_irq (struct device *dev,int irq_num) { -struct device_node *node = dev->of_node;int nr_irqs;int status;u8 mask[3 ];
@@ -412,8 +411,8 @@ int twl6030_init_irq(struct device *dev, int irq_num) twl6030_irq->irq_mapping_tbl = of_id->data; twl6030_irq->irq_domain = -irq_domain_add_linear (node, nr_irqs, - &twl6030_irq_domain_ops, twl6030_irq); +irq_domain_create_linear (of_fwnode_handle (dev->of_node), nr_irqs, + &twl6030_irq_domain_ops, twl6030_irq);if (!twl6030_irq->irq_domain) {dev_err (dev,"Can't add irq_domain\n" );return -ENOMEM ;
drivers/mfd/wm831x-irq.c +6 -9
@@ -587,16 +587,13 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq) }if (irq_base) - domain =irq_domain_add_legacy (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - irq_base,0 , - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_legacy (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), irq_base,0 , + &wm831x_irq_domain_ops, wm831x);else - domain =irq_domain_add_linear (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_linear (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), &wm831x_irq_domain_ops, + wm831x);if (!domain) {dev_warn (wm831x->dev,"Failed to allocate IRQ domain\n" );
drivers/mfd/wm8994-irq.c +1 -3
@@ -213,9 +213,7 @@ int wm8994_irq_init(struct wm8994 *wm8994)return ret; } - wm8994->edge_irq =irq_domain_add_linear (NULL ,1 , - &wm8994_edge_irq_ops, - wm8994); + wm8994->edge_irq =irq_domain_create_linear (NULL ,1 , &wm8994_edge_irq_ops, wm8994); ret = regmap_add_irq_chip(wm8994->regmap, irq_create_mapping(wm8994->edge_irq,
[tip: irq/cleanups] mfd: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: e3d44f11da04d61584ce690e1d9d987b38f1250e Gitweb: https://git.kernel.org/tip/e3d44f11da04d61584ce690e1d9d987b38f1250e Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:17 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 15:39:39 +02:00
mfd: 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 ]
--- drivers/mfd/88pm860x-core.c | 4 ++-- drivers/mfd/ab8500-core.c | 6 +++--- drivers/mfd/arizona-irq.c | 3 +-- drivers/mfd/db8500-prcmu.c | 6 +++--- drivers/mfd/fsl-imx25-tsadc.c | 5 ++--- drivers/mfd/lp8788-irq.c | 2 +- drivers/mfd/max8925-core.c | 4 ++-- drivers/mfd/max8997-irq.c | 4 ++-- drivers/mfd/max8998-irq.c | 2 +- drivers/mfd/mt6358-irq.c | 6 +++--- drivers/mfd/mt6397-irq.c | 6 ++---- drivers/mfd/qcom-pm8xxx.c | 6 ++---- drivers/mfd/stmfx.c | 2 +- drivers/mfd/stmpe.c | 4 ++-- drivers/mfd/tc3589x.c | 6 +++--- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/twl4030-irq.c | 4 ++-- drivers/mfd/twl6030-irq.c | 5 ++--- drivers/mfd/wm831x-irq.c | 15 ++++++--------- drivers/mfd/wm8994-irq.c | 4 +--- 21 files changed, 43 insertions(+), 55 deletions(-)
drivers/mfd/88pm860x-core.c +2 -2
@@ -624,8 +624,8 @@ static int device_irq_init(struct pm860x_chip *chip, ret = -EBUSY ; goto out; } -irq_domain_add_legacy (node, nr_irqs, chip->irq_base,0 , - &pm860x_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, chip->irq_base,0 , + &pm860x_irq_domain_ops, chip); chip->core_irq = i2c->irq;if (!chip->core_irq) goto out;
drivers/mfd/ab8500-core.c +3 -3
@@ -580,9 +580,9 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np) num_irqs =AB8500_NR_IRQS ;/* If ->irq_base is zero this will give a linear mapping */ - ab8500->domain =irq_domain_add_simple (ab8500->dev->of_node, - num_irqs,0 , - &ab8500_irq_ops, ab8500); + ab8500->domain =irq_domain_create_simple (of_fwnode_handle (ab8500->dev->of_node), + num_irqs,0 , + &ab8500_irq_ops, ab8500);if (!ab8500->domain) {dev_err (ab8500->dev,"Failed to create irqdomain\n" );
drivers/mfd/arizona-irq.c +1 -2
@@ -312,8 +312,7 @@ int arizona_irq_init(struct arizona *arizona) flags |= arizona->pdata.irq_flags;/* Allocate a virtual IRQ domain to distribute to the regmap domains */ - arizona->virq =irq_domain_add_linear (NULL ,2 , &arizona_domain_ops, - arizona); + arizona->virq =irq_domain_create_linear (NULL ,2 , &arizona_domain_ops, arizona);if (!arizona->virq) {dev_err (arizona->dev,"Failed to add core IRQ domain\n" ); ret = -EINVAL ;
drivers/mfd/db8500-prcmu.c +3 -3
@@ -2607,9 +2607,9 @@ static int db8500_irq_init(struct device_node *np) {int i; - db8500_irq_domain =irq_domain_add_simple ( - np,NUM_PRCMU_WAKEUPS ,0 , - &db8500_irq_ops,NULL ); + db8500_irq_domain =irq_domain_create_simple (of_fwnode_handle (np), +NUM_PRCMU_WAKEUPS ,0 , + &db8500_irq_ops,NULL );if (!db8500_irq_domain) {pr_err ("Failed to create irqdomain\n" );
drivers/mfd/fsl-imx25-tsadc.c +2 -3
@@ -65,15 +65,14 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev, struct mx25_tsadc *tsadc) {struct device *dev = &pdev->dev; -struct device_node *np = dev->of_node;int irq; irq =platform_get_irq (pdev,0 );if (irq <0 )return irq; - tsadc->domain =irq_domain_add_simple (np,2 ,0 , &mx25_tsadc_domain_ops, - tsadc); + tsadc->domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node),2 ,0 , + &mx25_tsadc_domain_ops, tsadc);if (!tsadc->domain) {dev_err (dev,"Failed to add irq domain\n" );return -ENOMEM ;
drivers/mfd/lp8788-irq.c +1 -1
@@ -161,7 +161,7 @@ int lp8788_irq_init(struct lp8788 *lp, int irq)return -ENOMEM ; irqd->lp = lp; - irqd->domain =irq_domain_add_linear (lp->dev->of_node,LP8788_INT_MAX , + irqd->domain =irq_domain_create_linear (of_fwnode_handle (lp->dev->of_node),LP8788_INT_MAX , &lp8788_domain_ops, irqd);if (!irqd->domain) {dev_err (lp->dev,"failed to add irq domain err\n" );
drivers/mfd/max8925-core.c +2 -2
@@ -682,8 +682,8 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,return -EBUSY ; } -irq_domain_add_legacy (node,MAX8925_NR_IRQS , chip->irq_base,0 , - &max8925_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node),MAX8925_NR_IRQS , chip->irq_base,0 , + &max8925_irq_domain_ops, chip);/* request irq handler for pmic main irq*/ chip->core_irq = irq;
drivers/mfd/max8997-irq.c +2 -2
@@ -327,8 +327,8 @@ int max8997_irq_init(struct max8997_dev *max8997) true : false; } - domain =irq_domain_add_linear (NULL ,MAX8997_IRQ_NR , - &max8997_irq_domain_ops, max8997); + domain =irq_domain_create_linear (NULL ,MAX8997_IRQ_NR , + &max8997_irq_domain_ops, max8997);if (!domain) {dev_err (max8997->dev,"could not create irq domain\n" );return -ENODEV ;
drivers/mfd/max8998-irq.c +1 -1
@@ -230,7 +230,7 @@ int max8998_irq_init(struct max8998_dev *max8998)max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM1 ,0xff );max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM2 ,0xff ); - domain =irq_domain_add_simple (NULL ,MAX8998_IRQ_NR , + domain =irq_domain_create_simple (NULL ,MAX8998_IRQ_NR , max8998->irq_base, &max8998_irq_domain_ops, max8998);if (!domain) {dev_err (max8998->dev,"could not create irq domain\n" );
drivers/mfd/mt6358-irq.c +3 -3
@@ -272,9 +272,9 @@ int mt6358_irq_init(struct mt6397_chip *chip) irqd->pmic_ints[i].en_reg_shift * j, 0); } - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, - irqd->num_pmic_irqs, - &mt6358_irq_domain_ops, chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), + irqd->num_pmic_irqs, + &mt6358_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"Could not create IRQ domain\n" );return -ENODEV ;
drivers/mfd/mt6397-irq.c +2 -4
@@ -216,10 +216,8 @@ int mt6397_irq_init(struct mt6397_chip *chip)regmap_write (chip->regmap, chip->int_con[2 ],0x0 ); chip->pm_nb.notifier_call = mt6397_irq_pm_notifier; - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, -MT6397_IRQ_NR , - &mt6397_irq_domain_ops, - chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), +MT6397_IRQ_NR , &mt6397_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"could not create irq domain\n" );return -ENOMEM ;
drivers/mfd/qcom-pm8xxx.c +2 -4
@@ -559,10 +559,8 @@ static int pm8xxx_probe(struct platform_device *pdev) chip->pm_irq_data = data;spin_lock_init (&chip->pm_irq_lock); - chip->irqdomain =irq_domain_add_linear (pdev->dev.of_node, - data->num_irqs, - &pm8xxx_irq_domain_ops, - chip); + chip->irqdomain =irq_domain_create_linear (of_fwnode_handle (pdev->dev.of_node), + data->num_irqs, &pm8xxx_irq_domain_ops, chip);if (!chip->irqdomain)return -ENODEV ;
drivers/mfd/stmfx.c +1 -1
@@ -269,7 +269,7 @@ static int stmfx_irq_init(struct i2c_client *client)u32 irqoutpin =0 , irqtrigger;int ret; - stmfx->irq_domain =irq_domain_add_simple (stmfx->dev->of_node, + stmfx->irq_domain =irq_domain_create_simple (of_fwnode_handle (stmfx->dev->of_node),STMFX_REG_IRQ_SRC_MAX ,0 , &stmfx_irq_ops, stmfx);if (!stmfx->irq_domain) {
drivers/mfd/stmpe.c +2 -2
@@ -1219,8 +1219,8 @@ static int stmpe_irq_init(struct stmpe *stmpe, struct device_node *np)int base =0 ;int num_irqs = stmpe->variant->num_irqs; - stmpe->domain =irq_domain_add_simple (np, num_irqs, base, - &stmpe_irq_ops, stmpe); + stmpe->domain =irq_domain_create_simple (of_fwnode_handle (np), num_irqs, + base, &stmpe_irq_ops, stmpe);if (!stmpe->domain) {dev_err (stmpe->dev,"Failed to create irqdomain\n" );return -ENOSYS ;
drivers/mfd/tc3589x.c +3 -3
@@ -234,9 +234,9 @@ static const struct irq_domain_ops tc3589x_irq_ops = {static int tc3589x_irq_init (struct tc3589x *tc3589x,struct device_node *np) { - tc3589x->domain =irq_domain_add_simple ( - np, TC3589x_NR_INTERNAL_IRQS,0 , - &tc3589x_irq_ops, tc3589x); + tc3589x->domain =irq_domain_create_simple (of_fwnode_handle (np), + TC3589x_NR_INTERNAL_IRQS,0 , + &tc3589x_irq_ops, tc3589x);if (!tc3589x->domain) {dev_err (tc3589x->dev,"Failed to create irqdomain\n" );
drivers/mfd/tps65217.c +1 -1
@@ -158,7 +158,7 @@ static int tps65217_irq_init(struct tps65217 *tps, int irq)tps65217_set_bits (tps,TPS65217_REG_INT ,TPS65217_INT_MASK ,TPS65217_INT_MASK ,TPS65217_PROTECT_NONE ); - tps->irq_domain =irq_domain_add_linear (tps->dev->of_node, + tps->irq_domain =irq_domain_create_linear (of_fwnode_handle (tps->dev->of_node),TPS65217_NUM_IRQ , &tps65217_irq_domain_ops, tps);if (!tps->irq_domain) {dev_err (tps->dev,"Could not create IRQ domain\n" );
drivers/mfd/tps6586x.c +1 -1
@@ -363,7 +363,7 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq, new_irq_base =0 ; } - tps6586x->irq_domain =irq_domain_add_simple (tps6586x->dev->of_node, + tps6586x->irq_domain =irq_domain_create_simple (of_fwnode_handle (tps6586x->dev->of_node), irq_num, new_irq_base, &tps6586x_domain_ops, tps6586x);if (!tps6586x->irq_domain) {
drivers/mfd/twl4030-irq.c +2 -2
@@ -691,8 +691,8 @@ int twl4030_init_irq(struct device *dev, int irq_num)return irq_base; } -irq_domain_add_legacy (node, nr_irqs, irq_base,0 , - &irq_domain_simple_ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &irq_domain_simple_ops,NULL ); irq_end = irq_base +TWL4030_CORE_NR_IRQS ;
drivers/mfd/twl6030-irq.c +2 -3
@@ -364,7 +364,6 @@ static const struct of_device_id twl6030_of_match[] __maybe_unused = {int twl6030_init_irq (struct device *dev,int irq_num) { -struct device_node *node = dev->of_node;int nr_irqs;int status;u8 mask[3 ];
@@ -412,8 +411,8 @@ int twl6030_init_irq(struct device *dev, int irq_num) twl6030_irq->irq_mapping_tbl = of_id->data; twl6030_irq->irq_domain = -irq_domain_add_linear (node, nr_irqs, - &twl6030_irq_domain_ops, twl6030_irq); +irq_domain_create_linear (of_fwnode_handle (dev->of_node), nr_irqs, + &twl6030_irq_domain_ops, twl6030_irq);if (!twl6030_irq->irq_domain) {dev_err (dev,"Can't add irq_domain\n" );return -ENOMEM ;
drivers/mfd/wm831x-irq.c +6 -9
@@ -587,16 +587,13 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq) }if (irq_base) - domain =irq_domain_add_legacy (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - irq_base,0 , - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_legacy (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), irq_base,0 , + &wm831x_irq_domain_ops, wm831x);else - domain =irq_domain_add_linear (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_linear (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), &wm831x_irq_domain_ops, + wm831x);if (!domain) {dev_warn (wm831x->dev,"Failed to allocate IRQ domain\n" );
drivers/mfd/wm8994-irq.c +1 -3
@@ -213,9 +213,7 @@ int wm8994_irq_init(struct wm8994 *wm8994)return ret; } - wm8994->edge_irq =irq_domain_add_linear (NULL ,1 , - &wm8994_edge_irq_ops, - wm8994); + wm8994->edge_irq =irq_domain_create_linear (NULL ,1 , &wm8994_edge_irq_ops, wm8994); ret = regmap_add_irq_chip(wm8994->regmap, irq_create_mapping(wm8994->edge_irq,
[tip: irq/cleanups] mfd: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: a36aa0f7226a25c8789c63347d97620dd47ab6e1 Gitweb: https://git.kernel.org/tip/a36aa0f7226a25c8789c63347d97620dd47ab6e1 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:17 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:10 +02:00
mfd: 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 ]
--- drivers/mfd/88pm860x-core.c | 4 ++-- drivers/mfd/ab8500-core.c | 6 +++--- drivers/mfd/arizona-irq.c | 3 +-- drivers/mfd/db8500-prcmu.c | 6 +++--- drivers/mfd/fsl-imx25-tsadc.c | 5 ++--- drivers/mfd/lp8788-irq.c | 2 +- drivers/mfd/max8925-core.c | 4 ++-- drivers/mfd/max8997-irq.c | 4 ++-- drivers/mfd/max8998-irq.c | 2 +- drivers/mfd/mt6358-irq.c | 6 +++--- drivers/mfd/mt6397-irq.c | 6 ++---- drivers/mfd/qcom-pm8xxx.c | 6 ++---- drivers/mfd/stmfx.c | 2 +- drivers/mfd/stmpe.c | 4 ++-- drivers/mfd/tc3589x.c | 6 +++--- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/twl4030-irq.c | 4 ++-- drivers/mfd/twl6030-irq.c | 5 ++--- drivers/mfd/wm831x-irq.c | 15 ++++++--------- drivers/mfd/wm8994-irq.c | 4 +--- 21 files changed, 43 insertions(+), 55 deletions(-)
drivers/mfd/88pm860x-core.c +2 -2
@@ -624,8 +624,8 @@ static int device_irq_init(struct pm860x_chip *chip, ret = -EBUSY ; goto out; } -irq_domain_add_legacy (node, nr_irqs, chip->irq_base,0 , - &pm860x_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, chip->irq_base,0 , + &pm860x_irq_domain_ops, chip); chip->core_irq = i2c->irq;if (!chip->core_irq) goto out;
drivers/mfd/ab8500-core.c +3 -3
@@ -580,9 +580,9 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np) num_irqs =AB8500_NR_IRQS ;/* If ->irq_base is zero this will give a linear mapping */ - ab8500->domain =irq_domain_add_simple (ab8500->dev->of_node, - num_irqs,0 , - &ab8500_irq_ops, ab8500); + ab8500->domain =irq_domain_create_simple (of_fwnode_handle (ab8500->dev->of_node), + num_irqs,0 , + &ab8500_irq_ops, ab8500);if (!ab8500->domain) {dev_err (ab8500->dev,"Failed to create irqdomain\n" );
drivers/mfd/arizona-irq.c +1 -2
@@ -312,8 +312,7 @@ int arizona_irq_init(struct arizona *arizona) flags |= arizona->pdata.irq_flags;/* Allocate a virtual IRQ domain to distribute to the regmap domains */ - arizona->virq =irq_domain_add_linear (NULL ,2 , &arizona_domain_ops, - arizona); + arizona->virq =irq_domain_create_linear (NULL ,2 , &arizona_domain_ops, arizona);if (!arizona->virq) {dev_err (arizona->dev,"Failed to add core IRQ domain\n" ); ret = -EINVAL ;
drivers/mfd/db8500-prcmu.c +3 -3
@@ -2607,9 +2607,9 @@ static int db8500_irq_init(struct device_node *np) {int i; - db8500_irq_domain =irq_domain_add_simple ( - np,NUM_PRCMU_WAKEUPS ,0 , - &db8500_irq_ops,NULL ); + db8500_irq_domain =irq_domain_create_simple (of_fwnode_handle (np), +NUM_PRCMU_WAKEUPS ,0 , + &db8500_irq_ops,NULL );if (!db8500_irq_domain) {pr_err ("Failed to create irqdomain\n" );
drivers/mfd/fsl-imx25-tsadc.c +2 -3
@@ -65,15 +65,14 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev, struct mx25_tsadc *tsadc) {struct device *dev = &pdev->dev; -struct device_node *np = dev->of_node;int irq; irq =platform_get_irq (pdev,0 );if (irq <0 )return irq; - tsadc->domain =irq_domain_add_simple (np,2 ,0 , &mx25_tsadc_domain_ops, - tsadc); + tsadc->domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node),2 ,0 , + &mx25_tsadc_domain_ops, tsadc);if (!tsadc->domain) {dev_err (dev,"Failed to add irq domain\n" );return -ENOMEM ;
drivers/mfd/lp8788-irq.c +1 -1
@@ -161,7 +161,7 @@ int lp8788_irq_init(struct lp8788 *lp, int irq)return -ENOMEM ; irqd->lp = lp; - irqd->domain =irq_domain_add_linear (lp->dev->of_node,LP8788_INT_MAX , + irqd->domain =irq_domain_create_linear (of_fwnode_handle (lp->dev->of_node),LP8788_INT_MAX , &lp8788_domain_ops, irqd);if (!irqd->domain) {dev_err (lp->dev,"failed to add irq domain err\n" );
drivers/mfd/max8925-core.c +2 -2
@@ -682,8 +682,8 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,return -EBUSY ; } -irq_domain_add_legacy (node,MAX8925_NR_IRQS , chip->irq_base,0 , - &max8925_irq_domain_ops, chip); +irq_domain_create_legacy (of_fwnode_handle (node),MAX8925_NR_IRQS , chip->irq_base,0 , + &max8925_irq_domain_ops, chip);/* request irq handler for pmic main irq*/ chip->core_irq = irq;
drivers/mfd/max8997-irq.c +2 -2
@@ -327,8 +327,8 @@ int max8997_irq_init(struct max8997_dev *max8997) true : false; } - domain =irq_domain_add_linear (NULL ,MAX8997_IRQ_NR , - &max8997_irq_domain_ops, max8997); + domain =irq_domain_create_linear (NULL ,MAX8997_IRQ_NR , + &max8997_irq_domain_ops, max8997);if (!domain) {dev_err (max8997->dev,"could not create irq domain\n" );return -ENODEV ;
drivers/mfd/max8998-irq.c +1 -1
@@ -230,7 +230,7 @@ int max8998_irq_init(struct max8998_dev *max8998)max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM1 ,0xff );max8998_write_reg (max8998->i2c,MAX8998_REG_STATUSM2 ,0xff ); - domain =irq_domain_add_simple (NULL ,MAX8998_IRQ_NR , + domain =irq_domain_create_simple (NULL ,MAX8998_IRQ_NR , max8998->irq_base, &max8998_irq_domain_ops, max8998);if (!domain) {dev_err (max8998->dev,"could not create irq domain\n" );
drivers/mfd/mt6358-irq.c +3 -3
@@ -272,9 +272,9 @@ int mt6358_irq_init(struct mt6397_chip *chip) irqd->pmic_ints[i].en_reg_shift * j, 0); } - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, - irqd->num_pmic_irqs, - &mt6358_irq_domain_ops, chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), + irqd->num_pmic_irqs, + &mt6358_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"Could not create IRQ domain\n" );return -ENODEV ;
drivers/mfd/mt6397-irq.c +2 -4
@@ -216,10 +216,8 @@ int mt6397_irq_init(struct mt6397_chip *chip)regmap_write (chip->regmap, chip->int_con[2 ],0x0 ); chip->pm_nb.notifier_call = mt6397_irq_pm_notifier; - chip->irq_domain =irq_domain_add_linear (chip->dev->of_node, -MT6397_IRQ_NR , - &mt6397_irq_domain_ops, - chip); + chip->irq_domain =irq_domain_create_linear (of_fwnode_handle (chip->dev->of_node), +MT6397_IRQ_NR , &mt6397_irq_domain_ops, chip);if (!chip->irq_domain) {dev_err (chip->dev,"could not create irq domain\n" );return -ENOMEM ;
drivers/mfd/qcom-pm8xxx.c +2 -4
@@ -559,10 +559,8 @@ static int pm8xxx_probe(struct platform_device *pdev) chip->pm_irq_data = data;spin_lock_init (&chip->pm_irq_lock); - chip->irqdomain =irq_domain_add_linear (pdev->dev.of_node, - data->num_irqs, - &pm8xxx_irq_domain_ops, - chip); + chip->irqdomain =irq_domain_create_linear (of_fwnode_handle (pdev->dev.of_node), + data->num_irqs, &pm8xxx_irq_domain_ops, chip);if (!chip->irqdomain)return -ENODEV ;
drivers/mfd/stmfx.c +1 -1
@@ -269,7 +269,7 @@ static int stmfx_irq_init(struct i2c_client *client)u32 irqoutpin =0 , irqtrigger;int ret; - stmfx->irq_domain =irq_domain_add_simple (stmfx->dev->of_node, + stmfx->irq_domain =irq_domain_create_simple (of_fwnode_handle (stmfx->dev->of_node),STMFX_REG_IRQ_SRC_MAX ,0 , &stmfx_irq_ops, stmfx);if (!stmfx->irq_domain) {
drivers/mfd/stmpe.c +2 -2
@@ -1219,8 +1219,8 @@ static int stmpe_irq_init(struct stmpe *stmpe, struct device_node *np)int base =0 ;int num_irqs = stmpe->variant->num_irqs; - stmpe->domain =irq_domain_add_simple (np, num_irqs, base, - &stmpe_irq_ops, stmpe); + stmpe->domain =irq_domain_create_simple (of_fwnode_handle (np), num_irqs, + base, &stmpe_irq_ops, stmpe);if (!stmpe->domain) {dev_err (stmpe->dev,"Failed to create irqdomain\n" );return -ENOSYS ;
drivers/mfd/tc3589x.c +3 -3
@@ -234,9 +234,9 @@ static const struct irq_domain_ops tc3589x_irq_ops = {static int tc3589x_irq_init (struct tc3589x *tc3589x,struct device_node *np) { - tc3589x->domain =irq_domain_add_simple ( - np, TC3589x_NR_INTERNAL_IRQS,0 , - &tc3589x_irq_ops, tc3589x); + tc3589x->domain =irq_domain_create_simple (of_fwnode_handle (np), + TC3589x_NR_INTERNAL_IRQS,0 , + &tc3589x_irq_ops, tc3589x);if (!tc3589x->domain) {dev_err (tc3589x->dev,"Failed to create irqdomain\n" );
drivers/mfd/tps65217.c +1 -1
@@ -158,7 +158,7 @@ static int tps65217_irq_init(struct tps65217 *tps, int irq)tps65217_set_bits (tps,TPS65217_REG_INT ,TPS65217_INT_MASK ,TPS65217_INT_MASK ,TPS65217_PROTECT_NONE ); - tps->irq_domain =irq_domain_add_linear (tps->dev->of_node, + tps->irq_domain =irq_domain_create_linear (of_fwnode_handle (tps->dev->of_node),TPS65217_NUM_IRQ , &tps65217_irq_domain_ops, tps);if (!tps->irq_domain) {dev_err (tps->dev,"Could not create IRQ domain\n" );
drivers/mfd/tps6586x.c +1 -1
@@ -363,7 +363,7 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq, new_irq_base =0 ; } - tps6586x->irq_domain =irq_domain_add_simple (tps6586x->dev->of_node, + tps6586x->irq_domain =irq_domain_create_simple (of_fwnode_handle (tps6586x->dev->of_node), irq_num, new_irq_base, &tps6586x_domain_ops, tps6586x);if (!tps6586x->irq_domain) {
drivers/mfd/twl4030-irq.c +2 -2
@@ -691,8 +691,8 @@ int twl4030_init_irq(struct device *dev, int irq_num)return irq_base; } -irq_domain_add_legacy (node, nr_irqs, irq_base,0 , - &irq_domain_simple_ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (node), nr_irqs, irq_base,0 , + &irq_domain_simple_ops,NULL ); irq_end = irq_base +TWL4030_CORE_NR_IRQS ;
drivers/mfd/twl6030-irq.c +2 -3
@@ -364,7 +364,6 @@ static const struct of_device_id twl6030_of_match[] __maybe_unused = {int twl6030_init_irq (struct device *dev,int irq_num) { -struct device_node *node = dev->of_node;int nr_irqs;int status;u8 mask[3 ];
@@ -412,8 +411,8 @@ int twl6030_init_irq(struct device *dev, int irq_num) twl6030_irq->irq_mapping_tbl = of_id->data; twl6030_irq->irq_domain = -irq_domain_add_linear (node, nr_irqs, - &twl6030_irq_domain_ops, twl6030_irq); +irq_domain_create_linear (of_fwnode_handle (dev->of_node), nr_irqs, + &twl6030_irq_domain_ops, twl6030_irq);if (!twl6030_irq->irq_domain) {dev_err (dev,"Can't add irq_domain\n" );return -ENOMEM ;
drivers/mfd/wm831x-irq.c +6 -9
@@ -587,16 +587,13 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq) }if (irq_base) - domain =irq_domain_add_legacy (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - irq_base,0 , - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_legacy (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), irq_base,0 , + &wm831x_irq_domain_ops, wm831x);else - domain =irq_domain_add_linear (wm831x->dev->of_node, -ARRAY_SIZE (wm831x_irqs), - &wm831x_irq_domain_ops, - wm831x); + domain =irq_domain_create_linear (of_fwnode_handle (wm831x->dev->of_node), +ARRAY_SIZE (wm831x_irqs), &wm831x_irq_domain_ops, + wm831x);if (!domain) {dev_warn (wm831x->dev,"Failed to allocate IRQ domain\n" );
drivers/mfd/wm8994-irq.c +1 -3
@@ -213,9 +213,7 @@ int wm8994_irq_init(struct wm8994 *wm8994)return ret; } - wm8994->edge_irq =irq_domain_add_linear (NULL ,1 , - &wm8994_edge_irq_ops, - wm8994); + wm8994->edge_irq =irq_domain_create_linear (NULL ,1 , &wm8994_edge_irq_ops, wm8994); ret = regmap_add_irq_chip(wm8994->regmap, irq_create_mapping(wm8994->edge_irq,
PATCH v2 25/57 irqdomain: mips: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)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).
--- arch/mips/ath25/ar2315.c | 4 ++-- arch/mips/ath25/ar5312.c | 4 ++-- arch/mips/cavium-octeon/octeon-irq.c | 25 +++++++++++++------------ arch/mips/lantiq/irq.c | 2 +- arch/mips/pci/pci-ar2315.c | 4 ++-- arch/mips/pci/pci-rt3883.c | 7 ++++--- arch/mips/ralink/irq.c | 2 +- 7 files changed, 25 insertions(+), 23 deletions(-)
arch/mips/ath25/ar2315.c +2 -2
@@ -149,8 +149,8 @@ void __init ar2315_arch_init_irq(void) ath25_irq_dispatch = ar2315_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR2315_MISC_IRQ_COUNT , - &ar2315_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR2315_MISC_IRQ_COUNT , + &ar2315_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/ath25/ar5312.c +2 -2
@@ -143,8 +143,8 @@ void __init ar5312_arch_init_irq(void) ath25_irq_dispatch = ar5312_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR5312_MISC_IRQ_COUNT , - &ar5312_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR5312_MISC_IRQ_COUNT , + &ar5312_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/cavium-octeon/octeon-irq.c +13 -12
@@ -1503,8 +1503,8 @@ static int __init octeon_irq_init_ciu(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu_ops, dd); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu_ops, + dd);irq_set_default_domain (ciu_domain);/* CIU_0 */
@@ -1637,8 +1637,8 @@ static int __init octeon_irq_init_gpio(if (gpiod) {/* gpio domain host_data is the base hwirq number. */ gpiod->base_hwirq = base_hwirq; -irq_domain_add_linear ( - gpio_node,16 , &octeon_irq_domain_gpio_ops, gpiod); +irq_domain_create_linear (of_fwnode_handle (gpio_node),16 , + &octeon_irq_domain_gpio_ops, gpiod); }else {pr_warn ("Cannot allocate memory for GPIO irq_domain.\n" );return -ENOMEM ;
@@ -2074,8 +2074,8 @@ static int __init octeon_irq_init_ciu2(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu2_ops,NULL ); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu2_ops, +NULL );irq_set_default_domain (ciu_domain);/* CUI2 */
@@ -2331,11 +2331,12 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, } host_data->max_bits = val; - cib_domain =irq_domain_add_linear (ciu_node, host_data->max_bits, - &octeon_irq_domain_cib_ops, - host_data); + cib_domain =irq_domain_create_linear (of_fwnode_handle (ciu_node), + host_data->max_bits, + &octeon_irq_domain_cib_ops, + host_data);if (!cib_domain) { -pr_err ("ERROR: Couldn't irq_domain_add_linear()\n" ); +pr_err ("ERROR: Couldn't irq_domain_create_linear()\n" );return -ENOMEM ; }
@@ -2918,8 +2919,8 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,* Initialize all domains to use the default domain. Specific major * blocks will overwrite the default domain as needed. */ - domain =irq_domain_add_tree (ciu_node, &octeon_dflt_domain_ciu3_ops, - ciu3_info); + domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_dflt_domain_ciu3_ops, + ciu3_info);for (i =0 ; i <MAX_CIU3_DOMAINS ; i++) ciu3_info->domain[i] = domain;
arch/mips/lantiq/irq.c +1 -1
@@ -377,7 +377,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)for (i =0 ; i <MAX_IM ; i++)irq_set_chained_handler (i +2 , ltq_hw_irq_handler); - ltq_domain =irq_domain_add_linear (node, + ltq_domain =irq_domain_create_linear (of_fwnode_handle (node), (MAX_IM *INT_NUM_IM_OFFSET ) +MIPS_CPU_IRQ_CASCADE , &irq_domain_ops,0 );
arch/mips/pci/pci-ar2315.c +2 -2
@@ -469,8 +469,8 @@ static int ar2315_pci_probe(struct platform_device *pdev)if (err)return err; - apc->domain =irq_domain_add_linear (NULL ,AR2315_PCI_IRQ_COUNT , - &ar2315_pci_irq_domain_ops, apc); + apc->domain =irq_domain_create_linear (NULL ,AR2315_PCI_IRQ_COUNT , + &ar2315_pci_irq_domain_ops, apc);if (!apc->domain) {dev_err (dev,"failed to add IRQ domain\n" );return -ENOMEM ;
arch/mips/pci/pci-rt3883.c +4 -3
@@ -208,9 +208,10 @@ static int rt3883_pci_irq_init(struct device *dev,rt3883_pci_w32 (rpc,0 ,RT3883_PCI_REG_PCIENA ); rpc->irq_domain = -irq_domain_add_linear (rpc->intc_of_node,RT3883_PCI_IRQ_COUNT , - &rt3883_pci_irq_domain_ops, - rpc); +irq_domain_create_linear (of_fwnode_handle (rpc->intc_of_node), +RT3883_PCI_IRQ_COUNT , + &rt3883_pci_irq_domain_ops, + rpc);if (!rpc->irq_domain) {dev_err (dev,"unable to add IRQ domain\n" );return -ENODEV ;
arch/mips/ralink/irq.c +1 -1
@@ -176,7 +176,7 @@ static int __init intc_of_init(struct device_node *node,/* route all INTC interrupts to MIPS HW0 interrupt */ rt_intc_w32 (0 ,INTC_REG_TYPE ); - domain =irq_domain_add_legacy (node,RALINK_INTC_IRQ_COUNT , + domain =irq_domain_create_legacy (of_fwnode_handle (node),RALINK_INTC_IRQ_COUNT ,RALINK_INTC_IRQ_BASE ,0 , &irq_domain_ops,NULL );if (!domain)panic ("Failed to add irqdomain" );
Signature · 1 line
2.49.0
[tip: irq/cleanups] MIPS: Switch to irq_domain_create_*()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: d2c84bca14d99760a8b4fb3fe2808277af62586d Gitweb: https://git.kernel.org/tip/d2c84bca14d99760a8b4fb3fe2808277af62586d Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:18 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:06 +02:00
MIPS: 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).
--- arch/mips/ath25/ar2315.c | 4 ++-- arch/mips/ath25/ar5312.c | 4 ++-- arch/mips/cavium-octeon/octeon-irq.c | 25 +++++++++++++------------ arch/mips/lantiq/irq.c | 2 +- arch/mips/pci/pci-ar2315.c | 4 ++-- arch/mips/pci/pci-rt3883.c | 7 ++++--- arch/mips/ralink/irq.c | 2 +- 7 files changed, 25 insertions(+), 23 deletions(-)
arch/mips/ath25/ar2315.c +2 -2
@@ -149,8 +149,8 @@ void __init ar2315_arch_init_irq(void) ath25_irq_dispatch = ar2315_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR2315_MISC_IRQ_COUNT , - &ar2315_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR2315_MISC_IRQ_COUNT , + &ar2315_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/ath25/ar5312.c +2 -2
@@ -143,8 +143,8 @@ void __init ar5312_arch_init_irq(void) ath25_irq_dispatch = ar5312_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR5312_MISC_IRQ_COUNT , - &ar5312_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR5312_MISC_IRQ_COUNT , + &ar5312_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/cavium-octeon/octeon-irq.c +13 -12
@@ -1503,8 +1503,8 @@ static int __init octeon_irq_init_ciu(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu_ops, dd); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu_ops, + dd);irq_set_default_domain (ciu_domain);/* CIU_0 */
@@ -1637,8 +1637,8 @@ static int __init octeon_irq_init_gpio(if (gpiod) {/* gpio domain host_data is the base hwirq number. */ gpiod->base_hwirq = base_hwirq; -irq_domain_add_linear ( - gpio_node,16 , &octeon_irq_domain_gpio_ops, gpiod); +irq_domain_create_linear (of_fwnode_handle (gpio_node),16 , + &octeon_irq_domain_gpio_ops, gpiod); }else {pr_warn ("Cannot allocate memory for GPIO irq_domain.\n" );return -ENOMEM ;
@@ -2074,8 +2074,8 @@ static int __init octeon_irq_init_ciu2(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu2_ops,NULL ); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu2_ops, +NULL );irq_set_default_domain (ciu_domain);/* CUI2 */
@@ -2331,11 +2331,12 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, } host_data->max_bits = val; - cib_domain =irq_domain_add_linear (ciu_node, host_data->max_bits, - &octeon_irq_domain_cib_ops, - host_data); + cib_domain =irq_domain_create_linear (of_fwnode_handle (ciu_node), + host_data->max_bits, + &octeon_irq_domain_cib_ops, + host_data);if (!cib_domain) { -pr_err ("ERROR: Couldn't irq_domain_add_linear()\n" ); +pr_err ("ERROR: Couldn't irq_domain_create_linear()\n" );return -ENOMEM ; }
@@ -2918,8 +2919,8 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,* Initialize all domains to use the default domain. Specific major * blocks will overwrite the default domain as needed. */ - domain =irq_domain_add_tree (ciu_node, &octeon_dflt_domain_ciu3_ops, - ciu3_info); + domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_dflt_domain_ciu3_ops, + ciu3_info);for (i =0 ; i <MAX_CIU3_DOMAINS ; i++) ciu3_info->domain[i] = domain;
arch/mips/lantiq/irq.c +1 -1
@@ -377,7 +377,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)for (i =0 ; i <MAX_IM ; i++)irq_set_chained_handler (i +2 , ltq_hw_irq_handler); - ltq_domain =irq_domain_add_linear (node, + ltq_domain =irq_domain_create_linear (of_fwnode_handle (node), (MAX_IM *INT_NUM_IM_OFFSET ) +MIPS_CPU_IRQ_CASCADE , &irq_domain_ops,0 );
arch/mips/pci/pci-ar2315.c +2 -2
@@ -469,8 +469,8 @@ static int ar2315_pci_probe(struct platform_device *pdev)if (err)return err; - apc->domain =irq_domain_add_linear (NULL ,AR2315_PCI_IRQ_COUNT , - &ar2315_pci_irq_domain_ops, apc); + apc->domain =irq_domain_create_linear (NULL ,AR2315_PCI_IRQ_COUNT , + &ar2315_pci_irq_domain_ops, apc);if (!apc->domain) {dev_err (dev,"failed to add IRQ domain\n" );return -ENOMEM ;
arch/mips/pci/pci-rt3883.c +4 -3
@@ -208,9 +208,10 @@ static int rt3883_pci_irq_init(struct device *dev,rt3883_pci_w32 (rpc,0 ,RT3883_PCI_REG_PCIENA ); rpc->irq_domain = -irq_domain_add_linear (rpc->intc_of_node,RT3883_PCI_IRQ_COUNT , - &rt3883_pci_irq_domain_ops, - rpc); +irq_domain_create_linear (of_fwnode_handle (rpc->intc_of_node), +RT3883_PCI_IRQ_COUNT , + &rt3883_pci_irq_domain_ops, + rpc);if (!rpc->irq_domain) {dev_err (dev,"unable to add IRQ domain\n" );return -ENODEV ;
arch/mips/ralink/irq.c +1 -1
@@ -176,7 +176,7 @@ static int __init intc_of_init(struct device_node *node,/* route all INTC interrupts to MIPS HW0 interrupt */ rt_intc_w32 (0 ,INTC_REG_TYPE ); - domain =irq_domain_add_legacy (node,RALINK_INTC_IRQ_COUNT , + domain =irq_domain_create_legacy (of_fwnode_handle (node),RALINK_INTC_IRQ_COUNT ,RALINK_INTC_IRQ_BASE ,0 , &irq_domain_ops,NULL );if (!domain)panic ("Failed to add irqdomain" );
[tip: irq/cleanups] MIPS: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 95c332368f12914d5c1ae7439decd8741c33a84d Gitweb: https://git.kernel.org/tip/95c332368f12914d5c1ae7439decd8741c33a84d Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:18 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:23 +02:00
MIPS: 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).
--- arch/mips/ath25/ar2315.c | 4 ++-- arch/mips/ath25/ar5312.c | 4 ++-- arch/mips/cavium-octeon/octeon-irq.c | 25 +++++++++++++------------ arch/mips/lantiq/irq.c | 2 +- arch/mips/pci/pci-ar2315.c | 4 ++-- arch/mips/pci/pci-rt3883.c | 7 ++++--- arch/mips/ralink/irq.c | 2 +- 7 files changed, 25 insertions(+), 23 deletions(-)
arch/mips/ath25/ar2315.c +2 -2
@@ -149,8 +149,8 @@ void __init ar2315_arch_init_irq(void) ath25_irq_dispatch = ar2315_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR2315_MISC_IRQ_COUNT , - &ar2315_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR2315_MISC_IRQ_COUNT , + &ar2315_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/ath25/ar5312.c +2 -2
@@ -143,8 +143,8 @@ void __init ar5312_arch_init_irq(void) ath25_irq_dispatch = ar5312_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR5312_MISC_IRQ_COUNT , - &ar5312_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR5312_MISC_IRQ_COUNT , + &ar5312_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/cavium-octeon/octeon-irq.c +13 -12
@@ -1503,8 +1503,8 @@ static int __init octeon_irq_init_ciu(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu_ops, dd); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu_ops, + dd);irq_set_default_domain (ciu_domain);/* CIU_0 */
@@ -1637,8 +1637,8 @@ static int __init octeon_irq_init_gpio(if (gpiod) {/* gpio domain host_data is the base hwirq number. */ gpiod->base_hwirq = base_hwirq; -irq_domain_add_linear ( - gpio_node,16 , &octeon_irq_domain_gpio_ops, gpiod); +irq_domain_create_linear (of_fwnode_handle (gpio_node),16 , + &octeon_irq_domain_gpio_ops, gpiod); }else {pr_warn ("Cannot allocate memory for GPIO irq_domain.\n" );return -ENOMEM ;
@@ -2074,8 +2074,8 @@ static int __init octeon_irq_init_ciu2(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu2_ops,NULL ); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu2_ops, +NULL );irq_set_default_domain (ciu_domain);/* CUI2 */
@@ -2331,11 +2331,12 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, } host_data->max_bits = val; - cib_domain =irq_domain_add_linear (ciu_node, host_data->max_bits, - &octeon_irq_domain_cib_ops, - host_data); + cib_domain =irq_domain_create_linear (of_fwnode_handle (ciu_node), + host_data->max_bits, + &octeon_irq_domain_cib_ops, + host_data);if (!cib_domain) { -pr_err ("ERROR: Couldn't irq_domain_add_linear()\n" ); +pr_err ("ERROR: Couldn't irq_domain_create_linear()\n" );return -ENOMEM ; }
@@ -2918,8 +2919,8 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,* Initialize all domains to use the default domain. Specific major * blocks will overwrite the default domain as needed. */ - domain =irq_domain_add_tree (ciu_node, &octeon_dflt_domain_ciu3_ops, - ciu3_info); + domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_dflt_domain_ciu3_ops, + ciu3_info);for (i =0 ; i <MAX_CIU3_DOMAINS ; i++) ciu3_info->domain[i] = domain;
arch/mips/lantiq/irq.c +1 -1
@@ -377,7 +377,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)for (i =0 ; i <MAX_IM ; i++)irq_set_chained_handler (i +2 , ltq_hw_irq_handler); - ltq_domain =irq_domain_add_linear (node, + ltq_domain =irq_domain_create_linear (of_fwnode_handle (node), (MAX_IM *INT_NUM_IM_OFFSET ) +MIPS_CPU_IRQ_CASCADE , &irq_domain_ops,0 );
arch/mips/pci/pci-ar2315.c +2 -2
@@ -469,8 +469,8 @@ static int ar2315_pci_probe(struct platform_device *pdev)if (err)return err; - apc->domain =irq_domain_add_linear (NULL ,AR2315_PCI_IRQ_COUNT , - &ar2315_pci_irq_domain_ops, apc); + apc->domain =irq_domain_create_linear (NULL ,AR2315_PCI_IRQ_COUNT , + &ar2315_pci_irq_domain_ops, apc);if (!apc->domain) {dev_err (dev,"failed to add IRQ domain\n" );return -ENOMEM ;
arch/mips/pci/pci-rt3883.c +4 -3
@@ -208,9 +208,10 @@ static int rt3883_pci_irq_init(struct device *dev,rt3883_pci_w32 (rpc,0 ,RT3883_PCI_REG_PCIENA ); rpc->irq_domain = -irq_domain_add_linear (rpc->intc_of_node,RT3883_PCI_IRQ_COUNT , - &rt3883_pci_irq_domain_ops, - rpc); +irq_domain_create_linear (of_fwnode_handle (rpc->intc_of_node), +RT3883_PCI_IRQ_COUNT , + &rt3883_pci_irq_domain_ops, + rpc);if (!rpc->irq_domain) {dev_err (dev,"unable to add IRQ domain\n" );return -ENODEV ;
arch/mips/ralink/irq.c +1 -1
@@ -176,7 +176,7 @@ static int __init intc_of_init(struct device_node *node,/* route all INTC interrupts to MIPS HW0 interrupt */ rt_intc_w32 (0 ,INTC_REG_TYPE ); - domain =irq_domain_add_legacy (node,RALINK_INTC_IRQ_COUNT , + domain =irq_domain_create_legacy (of_fwnode_handle (node),RALINK_INTC_IRQ_COUNT ,RALINK_INTC_IRQ_BASE ,0 , &irq_domain_ops,NULL );if (!domain)panic ("Failed to add irqdomain" );
[tip: irq/cleanups] MIPS: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 080d3fa241f99b4c4d7c5ee15a879794ff255d8e Gitweb: https://git.kernel.org/tip/080d3fa241f99b4c4d7c5ee15a879794ff255d8e Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:18 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 15:39:39 +02:00
MIPS: 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).
--- arch/mips/ath25/ar2315.c | 4 ++-- arch/mips/ath25/ar5312.c | 4 ++-- arch/mips/cavium-octeon/octeon-irq.c | 25 +++++++++++++------------ arch/mips/lantiq/irq.c | 2 +- arch/mips/pci/pci-ar2315.c | 4 ++-- arch/mips/pci/pci-rt3883.c | 7 ++++--- arch/mips/ralink/irq.c | 2 +- 7 files changed, 25 insertions(+), 23 deletions(-)
arch/mips/ath25/ar2315.c +2 -2
@@ -149,8 +149,8 @@ void __init ar2315_arch_init_irq(void) ath25_irq_dispatch = ar2315_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR2315_MISC_IRQ_COUNT , - &ar2315_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR2315_MISC_IRQ_COUNT , + &ar2315_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/ath25/ar5312.c +2 -2
@@ -143,8 +143,8 @@ void __init ar5312_arch_init_irq(void) ath25_irq_dispatch = ar5312_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR5312_MISC_IRQ_COUNT , - &ar5312_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR5312_MISC_IRQ_COUNT , + &ar5312_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/cavium-octeon/octeon-irq.c +13 -12
@@ -1503,8 +1503,8 @@ static int __init octeon_irq_init_ciu(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu_ops, dd); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu_ops, + dd);irq_set_default_domain (ciu_domain);/* CIU_0 */
@@ -1637,8 +1637,8 @@ static int __init octeon_irq_init_gpio(if (gpiod) {/* gpio domain host_data is the base hwirq number. */ gpiod->base_hwirq = base_hwirq; -irq_domain_add_linear ( - gpio_node,16 , &octeon_irq_domain_gpio_ops, gpiod); +irq_domain_create_linear (of_fwnode_handle (gpio_node),16 , + &octeon_irq_domain_gpio_ops, gpiod); }else {pr_warn ("Cannot allocate memory for GPIO irq_domain.\n" );return -ENOMEM ;
@@ -2074,8 +2074,8 @@ static int __init octeon_irq_init_ciu2(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu2_ops,NULL ); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu2_ops, +NULL );irq_set_default_domain (ciu_domain);/* CUI2 */
@@ -2331,11 +2331,12 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, } host_data->max_bits = val; - cib_domain =irq_domain_add_linear (ciu_node, host_data->max_bits, - &octeon_irq_domain_cib_ops, - host_data); + cib_domain =irq_domain_create_linear (of_fwnode_handle (ciu_node), + host_data->max_bits, + &octeon_irq_domain_cib_ops, + host_data);if (!cib_domain) { -pr_err ("ERROR: Couldn't irq_domain_add_linear()\n" ); +pr_err ("ERROR: Couldn't irq_domain_create_linear()\n" );return -ENOMEM ; }
@@ -2918,8 +2919,8 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,* Initialize all domains to use the default domain. Specific major * blocks will overwrite the default domain as needed. */ - domain =irq_domain_add_tree (ciu_node, &octeon_dflt_domain_ciu3_ops, - ciu3_info); + domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_dflt_domain_ciu3_ops, + ciu3_info);for (i =0 ; i <MAX_CIU3_DOMAINS ; i++) ciu3_info->domain[i] = domain;
arch/mips/lantiq/irq.c +1 -1
@@ -377,7 +377,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)for (i =0 ; i <MAX_IM ; i++)irq_set_chained_handler (i +2 , ltq_hw_irq_handler); - ltq_domain =irq_domain_add_linear (node, + ltq_domain =irq_domain_create_linear (of_fwnode_handle (node), (MAX_IM *INT_NUM_IM_OFFSET ) +MIPS_CPU_IRQ_CASCADE , &irq_domain_ops,0 );
arch/mips/pci/pci-ar2315.c +2 -2
@@ -469,8 +469,8 @@ static int ar2315_pci_probe(struct platform_device *pdev)if (err)return err; - apc->domain =irq_domain_add_linear (NULL ,AR2315_PCI_IRQ_COUNT , - &ar2315_pci_irq_domain_ops, apc); + apc->domain =irq_domain_create_linear (NULL ,AR2315_PCI_IRQ_COUNT , + &ar2315_pci_irq_domain_ops, apc);if (!apc->domain) {dev_err (dev,"failed to add IRQ domain\n" );return -ENOMEM ;
arch/mips/pci/pci-rt3883.c +4 -3
@@ -208,9 +208,10 @@ static int rt3883_pci_irq_init(struct device *dev,rt3883_pci_w32 (rpc,0 ,RT3883_PCI_REG_PCIENA ); rpc->irq_domain = -irq_domain_add_linear (rpc->intc_of_node,RT3883_PCI_IRQ_COUNT , - &rt3883_pci_irq_domain_ops, - rpc); +irq_domain_create_linear (of_fwnode_handle (rpc->intc_of_node), +RT3883_PCI_IRQ_COUNT , + &rt3883_pci_irq_domain_ops, + rpc);if (!rpc->irq_domain) {dev_err (dev,"unable to add IRQ domain\n" );return -ENODEV ;
arch/mips/ralink/irq.c +1 -1
@@ -176,7 +176,7 @@ static int __init intc_of_init(struct device_node *node,/* route all INTC interrupts to MIPS HW0 interrupt */ rt_intc_w32 (0 ,INTC_REG_TYPE ); - domain =irq_domain_add_legacy (node,RALINK_INTC_IRQ_COUNT , + domain =irq_domain_create_legacy (of_fwnode_handle (node),RALINK_INTC_IRQ_COUNT ,RALINK_INTC_IRQ_BASE ,0 , &irq_domain_ops,NULL );if (!domain)panic ("Failed to add irqdomain" );
[tip: irq/cleanups] MIPS: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 0810f121e029e55a7846dfa5c6b106eabb0927fa Gitweb: https://git.kernel.org/tip/0810f121e029e55a7846dfa5c6b106eabb0927fa Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:18 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:10 +02:00
MIPS: 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).
--- arch/mips/ath25/ar2315.c | 4 ++-- arch/mips/ath25/ar5312.c | 4 ++-- arch/mips/cavium-octeon/octeon-irq.c | 25 +++++++++++++------------ arch/mips/lantiq/irq.c | 2 +- arch/mips/pci/pci-ar2315.c | 4 ++-- arch/mips/pci/pci-rt3883.c | 7 ++++--- arch/mips/ralink/irq.c | 2 +- 7 files changed, 25 insertions(+), 23 deletions(-)
arch/mips/ath25/ar2315.c +2 -2
@@ -149,8 +149,8 @@ void __init ar2315_arch_init_irq(void) ath25_irq_dispatch = ar2315_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR2315_MISC_IRQ_COUNT , - &ar2315_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR2315_MISC_IRQ_COUNT , + &ar2315_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/ath25/ar5312.c +2 -2
@@ -143,8 +143,8 @@ void __init ar5312_arch_init_irq(void) ath25_irq_dispatch = ar5312_irq_dispatch; - domain =irq_domain_add_linear (NULL ,AR5312_MISC_IRQ_COUNT , - &ar5312_misc_irq_domain_ops,NULL ); + domain =irq_domain_create_linear (NULL ,AR5312_MISC_IRQ_COUNT , + &ar5312_misc_irq_domain_ops,NULL );if (!domain)panic ("Failed to add IRQ domain" );
arch/mips/cavium-octeon/octeon-irq.c +13 -12
@@ -1503,8 +1503,8 @@ static int __init octeon_irq_init_ciu(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu_ops, dd); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu_ops, + dd);irq_set_default_domain (ciu_domain);/* CIU_0 */
@@ -1637,8 +1637,8 @@ static int __init octeon_irq_init_gpio(if (gpiod) {/* gpio domain host_data is the base hwirq number. */ gpiod->base_hwirq = base_hwirq; -irq_domain_add_linear ( - gpio_node,16 , &octeon_irq_domain_gpio_ops, gpiod); +irq_domain_create_linear (of_fwnode_handle (gpio_node),16 , + &octeon_irq_domain_gpio_ops, gpiod); }else {pr_warn ("Cannot allocate memory for GPIO irq_domain.\n" );return -ENOMEM ;
@@ -2074,8 +2074,8 @@ static int __init octeon_irq_init_ciu2(/* Mips internal */ octeon_irq_init_core (); - ciu_domain =irq_domain_add_tree ( - ciu_node, &octeon_irq_domain_ciu2_ops,NULL ); + ciu_domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_irq_domain_ciu2_ops, +NULL );irq_set_default_domain (ciu_domain);/* CUI2 */
@@ -2331,11 +2331,12 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, } host_data->max_bits = val; - cib_domain =irq_domain_add_linear (ciu_node, host_data->max_bits, - &octeon_irq_domain_cib_ops, - host_data); + cib_domain =irq_domain_create_linear (of_fwnode_handle (ciu_node), + host_data->max_bits, + &octeon_irq_domain_cib_ops, + host_data);if (!cib_domain) { -pr_err ("ERROR: Couldn't irq_domain_add_linear()\n" ); +pr_err ("ERROR: Couldn't irq_domain_create_linear()\n" );return -ENOMEM ; }
@@ -2918,8 +2919,8 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,* Initialize all domains to use the default domain. Specific major * blocks will overwrite the default domain as needed. */ - domain =irq_domain_add_tree (ciu_node, &octeon_dflt_domain_ciu3_ops, - ciu3_info); + domain =irq_domain_create_tree (of_fwnode_handle (ciu_node), &octeon_dflt_domain_ciu3_ops, + ciu3_info);for (i =0 ; i <MAX_CIU3_DOMAINS ; i++) ciu3_info->domain[i] = domain;
arch/mips/lantiq/irq.c +1 -1
@@ -377,7 +377,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)for (i =0 ; i <MAX_IM ; i++)irq_set_chained_handler (i +2 , ltq_hw_irq_handler); - ltq_domain =irq_domain_add_linear (node, + ltq_domain =irq_domain_create_linear (of_fwnode_handle (node), (MAX_IM *INT_NUM_IM_OFFSET ) +MIPS_CPU_IRQ_CASCADE , &irq_domain_ops,0 );
arch/mips/pci/pci-ar2315.c +2 -2
@@ -469,8 +469,8 @@ static int ar2315_pci_probe(struct platform_device *pdev)if (err)return err; - apc->domain =irq_domain_add_linear (NULL ,AR2315_PCI_IRQ_COUNT , - &ar2315_pci_irq_domain_ops, apc); + apc->domain =irq_domain_create_linear (NULL ,AR2315_PCI_IRQ_COUNT , + &ar2315_pci_irq_domain_ops, apc);if (!apc->domain) {dev_err (dev,"failed to add IRQ domain\n" );return -ENOMEM ;
arch/mips/pci/pci-rt3883.c +4 -3
@@ -208,9 +208,10 @@ static int rt3883_pci_irq_init(struct device *dev,rt3883_pci_w32 (rpc,0 ,RT3883_PCI_REG_PCIENA ); rpc->irq_domain = -irq_domain_add_linear (rpc->intc_of_node,RT3883_PCI_IRQ_COUNT , - &rt3883_pci_irq_domain_ops, - rpc); +irq_domain_create_linear (of_fwnode_handle (rpc->intc_of_node), +RT3883_PCI_IRQ_COUNT , + &rt3883_pci_irq_domain_ops, + rpc);if (!rpc->irq_domain) {dev_err (dev,"unable to add IRQ domain\n" );return -ENODEV ;
arch/mips/ralink/irq.c +1 -1
@@ -176,7 +176,7 @@ static int __init intc_of_init(struct device_node *node,/* route all INTC interrupts to MIPS HW0 interrupt */ rt_intc_w32 (0 ,INTC_REG_TYPE ); - domain =irq_domain_add_legacy (node,RALINK_INTC_IRQ_COUNT , + domain =irq_domain_create_legacy (of_fwnode_handle (node),RALINK_INTC_IRQ_COUNT ,RALINK_INTC_IRQ_BASE ,0 , &irq_domain_ops,NULL );if (!domain)panic ("Failed to add irqdomain" );
PATCH v2 26/57 irqdomain: misc: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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).
--- drivers/misc/hi6421v600-irq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/hi6421v600-irq.c +3 -2
@@ -254,8 +254,9 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)if (!priv->irqs)return -ENOMEM ; - priv->domain =irq_domain_add_simple (np,PMIC_IRQ_LIST_MAX ,0 , - &hi6421v600_domain_ops, priv); + priv->domain =irq_domain_create_simple (of_fwnode_handle (np), +PMIC_IRQ_LIST_MAX ,0 , + &hi6421v600_domain_ops, priv);if (!priv->domain) {dev_err (dev,"Failed to create IRQ domain\n" );return -ENODEV ;
Signature · 1 line
2.49.0
[tip: irq/cleanups] misc: hi6421-spmi-pmic: Switch to irq_domain_create_simple()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: ae619cab900f362dabc847a999c9e82dacdeb533 Gitweb: https://git.kernel.org/tip/ae619cab900f362dabc847a999c9e82dacdeb533 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:19 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:06 +02:00
misc: hi6421-spmi-pmic: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/misc/hi6421v600-irq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/hi6421v600-irq.c +3 -2
@@ -254,8 +254,9 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)if (!priv->irqs)return -ENOMEM ; - priv->domain =irq_domain_add_simple (np,PMIC_IRQ_LIST_MAX ,0 , - &hi6421v600_domain_ops, priv); + priv->domain =irq_domain_create_simple (of_fwnode_handle (np), +PMIC_IRQ_LIST_MAX ,0 , + &hi6421v600_domain_ops, priv);if (!priv->domain) {dev_err (dev,"Failed to create IRQ domain\n" );return -ENODEV ;
[tip: irq/cleanups] misc: hi6421-spmi-pmic: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: a77cf24fe19c8f54f4845697caf74e4d9499b489 Gitweb: https://git.kernel.org/tip/a77cf24fe19c8f54f4845697caf74e4d9499b489 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:19 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:23 +02:00
misc: hi6421-spmi-pmic: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/misc/hi6421v600-irq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/hi6421v600-irq.c +3 -2
@@ -254,8 +254,9 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)if (!priv->irqs)return -ENOMEM ; - priv->domain =irq_domain_add_simple (np,PMIC_IRQ_LIST_MAX ,0 , - &hi6421v600_domain_ops, priv); + priv->domain =irq_domain_create_simple (of_fwnode_handle (np), +PMIC_IRQ_LIST_MAX ,0 , + &hi6421v600_domain_ops, priv);if (!priv->domain) {dev_err (dev,"Failed to create IRQ domain\n" );return -ENODEV ;
[tip: irq/cleanups] misc: hi6421-spmi-pmic: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 357f043f36b179e80dbbed3654a8098342589734 Gitweb: https://git.kernel.org/tip/357f043f36b179e80dbbed3654a8098342589734 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:19 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 15:39:39 +02:00
misc: hi6421-spmi-pmic: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/misc/hi6421v600-irq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/hi6421v600-irq.c +3 -2
@@ -254,8 +254,9 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)if (!priv->irqs)return -ENOMEM ; - priv->domain =irq_domain_add_simple (np,PMIC_IRQ_LIST_MAX ,0 , - &hi6421v600_domain_ops, priv); + priv->domain =irq_domain_create_simple (of_fwnode_handle (np), +PMIC_IRQ_LIST_MAX ,0 , + &hi6421v600_domain_ops, priv);if (!priv->domain) {dev_err (dev,"Failed to create IRQ domain\n" );return -ENODEV ;
[tip: irq/cleanups] misc: hi6421-spmi-pmic: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: d8566886f2387cdb3562c4b69f91d0f0eec672c0 Gitweb: https://git.kernel.org/tip/d8566886f2387cdb3562c4b69f91d0f0eec672c0 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:19 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:10 +02:00
misc: hi6421-spmi-pmic: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the 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 ]
--- drivers/misc/hi6421v600-irq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/hi6421v600-irq.c +3 -2
@@ -254,8 +254,9 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)if (!priv->irqs)return -ENOMEM ; - priv->domain =irq_domain_add_simple (np,PMIC_IRQ_LIST_MAX ,0 , - &hi6421v600_domain_ops, priv); + priv->domain =irq_domain_create_simple (of_fwnode_handle (np), +PMIC_IRQ_LIST_MAX ,0 , + &hi6421v600_domain_ops, priv);if (!priv->domain) {dev_err (dev,"Failed to create IRQ domain\n" );return -ENODEV ;