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).

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250319092951.37667-26-jirislaby@kernel.org

diff --git a/arch/mips/ath25/ar2315.c b/arch/mips/ath25/ar2315.c
index 8ccf167c167e050e47abc73e48ce31cba7406ec4..e8c38aaf46a2ea7d0c4e864d54511e097c920f12 100644 (file)
--- a/arch/mips/ath25/ar2315.c
+++ b/arch/mips/ath25/ar2315.c
@@ -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");
 

diff --git a/arch/mips/ath25/ar5312.c b/arch/mips/ath25/ar5312.c
index cfa103518113c1c1dd7db8d5ba4ac90aef524436..4a1d874be76611e658526dd3330f96e80d197d2b 100644 (file)
--- a/arch/mips/ath25/ar5312.c
+++ b/arch/mips/ath25/ar5312.c
@@ -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");
 

diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index e6b4d9c0c16978696cbaf0c790f8f5dd4f7716a8..5c3de175ef5b0a540b8a4f1b4012ddf50e351173 100644 (file)
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -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;
 

diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
index 8f208007b8e84c7b89d678b9bacc5b8410fb93b0..a112573b6e37b3ab81e6c15236bac1edfec4d07a 100644 (file)
--- a/arch/mips/lantiq/irq.c
+++ b/arch/mips/lantiq/irq.c
@@ -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);
 

diff --git a/arch/mips/pci/pci-ar2315.c b/arch/mips/pci/pci-ar2315.c
index a925842ee1256fd44988e082fba7d1fa25df11e0..17fa97ec6ffb17e696df7c5ad1ebdbfa471f65e8 100644 (file)
--- a/arch/mips/pci/pci-ar2315.c
+++ b/arch/mips/pci/pci-ar2315.c
@@ -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;

diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
index 4ac68a534e4f79f0e5d2c048422e2bf7d0639311..14454ece485d494edad5fd2f0f4da78ef5e2c235 100644 (file)
--- a/arch/mips/pci/pci-rt3883.c
+++ b/arch/mips/pci/pci-rt3883.c
@@ -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;

diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
index 46aef0a1b22acd3b58c2bd51c3b082774d2e4056..af5bbbea949b3b8f3cb184fe6e8c61b2414e49ac 100644 (file)
--- a/arch/mips/ralink/irq.c
+++ b/arch/mips/ralink/irq.c
@@ -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");