Commit a701f8e9 authored by Herve Codina's avatar Herve Codina Committed by Thomas Gleixner
Browse files

_PATCH_19_23_um_virt_pci_Use_irq_domain_instantiate_ 



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

[ tglx: Fixup struct initializer ]

Signed-off-by: default avatarHerve Codina <herve.codina@bootlin.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240614173232.1184015-20-herve.codina@bootlin.com
parent 2ada5ed6

arch/um/drivers/virt-pci.c

+10 −6
Original line number Diff line number Diff line
@@ -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);