File tree Expand file tree Collapse file tree 1 file changed +5
-10
lines changed Expand file tree Collapse file tree 1 file changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -538,11 +538,6 @@ void um_pci_platform_device_unregister(struct um_pci_device *dev)
538
538
539
539
static int __init um_pci_init (void )
540
540
{
541
- struct irq_domain_info inner_domain_info = {
542
- .size = MAX_MSI_VECTORS ,
543
- .hwirq_max = MAX_MSI_VECTORS ,
544
- .ops = & um_pci_inner_domain_ops ,
545
- };
546
541
int err , i ;
547
542
548
543
WARN_ON (logic_iomem_add_region (& virt_cfgspace_resource ,
@@ -564,10 +559,10 @@ static int __init um_pci_init(void)
564
559
goto free ;
565
560
}
566
561
567
- inner_domain_info . fwnode = um_pci_fwnode ;
568
- um_pci_inner_domain = irq_domain_instantiate ( & inner_domain_info );
569
- if (IS_ERR ( um_pci_inner_domain ) ) {
570
- err = PTR_ERR ( um_pci_inner_domain ) ;
562
+ um_pci_inner_domain = irq_domain_create_linear ( um_pci_fwnode , MAX_MSI_VECTORS ,
563
+ & um_pci_inner_domain_ops , NULL );
564
+ if (! um_pci_inner_domain ) {
565
+ err = - ENOMEM ;
571
566
goto free ;
572
567
}
573
568
@@ -602,7 +597,7 @@ static int __init um_pci_init(void)
602
597
return 0 ;
603
598
604
599
free :
605
- if (! IS_ERR_OR_NULL ( um_pci_inner_domain ) )
600
+ if (um_pci_inner_domain )
606
601
irq_domain_remove (um_pci_inner_domain );
607
602
if (um_pci_fwnode )
608
603
irq_domain_free_fwnode (um_pci_fwnode );
You can’t perform that action at this time.
0 commit comments