[PATCH 19/23] um: virt-pci: Use irq_domain_instantiate()

[Herve Codina]

um_pci_init() uses __irq_domain_add(). With the introduction of
irq_domain_instantiate(), __irq_domain_add() becomes obsolete.

In order to fully remove __irq_domain_add(), use directly
irq_domain_instantiate().

Signed-off-by: Herve Codina <herve.cod...@bootlin.com>
---
 arch/um/drivers/virt-pci.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c
index 7cb503469bbd..597d89338693 100644
--- a/arch/um/drivers/virt-pci.c
+++ b/arch/um/drivers/virt-pci.c
@@ -986,6 +986,11 @@ static struct resource virt_platform_resource = {
 
 static int __init um_pci_init(void)
 {
+       struct irq_domain_info inner_domain_info = {
+               .size = MAX_MSI_VECTORS,
+               .hwirq_max = MAX_MSI_VECTORS,
+               .ops = &um_pci_inner_domain_ops,
+       };
        int err, i;
 
        WARN_ON(logic_iomem_add_region(&virt_cfgspace_resource,
@@ -1015,11 +1020,10 @@ static int __init um_pci_init(void)
                goto free;
        }
 
-       um_pci_inner_domain = __irq_domain_add(um_pci_fwnode, MAX_MSI_VECTORS,
-                                              MAX_MSI_VECTORS, 0,
-                                              &um_pci_inner_domain_ops, NULL);
-       if (!um_pci_inner_domain) {
-               err = -ENOMEM;
+       inner_domain_info.fwnode = um_pci_fwnode;
+       um_pci_inner_domain = irq_domain_instantiate(&inner_domain_info);
+       if (IS_ERR(um_pci_inner_domain)) {
+               err = PTR_ERR(um_pci_inner_domain);
                goto free;
        }
 
@@ -1056,7 +1060,7 @@ static int __init um_pci_init(void)
                goto free;
        return 0;
 free:
-       if (um_pci_inner_domain)
+       if (!IS_ERR_OR_NULL(um_pci_inner_domain))
                irq_domain_remove(um_pci_inner_domain);
        if (um_pci_fwnode)
                irq_domain_free_fwnode(um_pci_fwnode);
-- 
2.45.0