hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xen: events: push set_irq_msi down into xen_create_msi_irq 

Makes the tail end of this function look even more like
xen_bind_pirq_msi_to_irq.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Ian Campbell 2011-02-18 16:43:35 +00:00 committed by Konrad Rzeszutek Wilk
parent 2e55288f63
commit f420e010ed
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/pci/xen.c
View File

@ -185,23 +185,15 @@ static void xen_teardown_msi_irq(unsigned int irq)
#ifdef CONFIG_XEN_DOM0 #ifdef CONFIG_XEN_DOM0
static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
{ {
int irq, ret; int irq;
struct msi_desc *msidesc; struct msi_desc *msidesc;
list_for_each_entry(msidesc, &dev->msi_list, list) { list_for_each_entry(msidesc, &dev->msi_list, list) {
irq = xen_create_msi_irq(dev, msidesc, type); irq = xen_create_msi_irq(dev, msidesc, type);
if (irq < 0) if (irq < 0)
return -1; return -1;
ret = set_irq_msi(irq, msidesc);
if (ret)
goto error;
} }
return 0; return 0;
error:
xen_destroy_irq(irq);
return ret;
} }
#endif #endif
#endif #endif

10
drivers/xen/events.c
View File

@ -691,7 +691,7 @@ error_irq:
int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type) int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type)
{ {
int irq = -1; int ret, irq = -1;
struct physdev_map_pirq map_irq; struct physdev_map_pirq map_irq;
int rc; int rc;
int pos; int pos;
@ -736,9 +736,17 @@ int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type)
handle_level_irq, handle_level_irq,
(type == PCI_CAP_ID_MSIX) ? "msi-x":"msi"); (type == PCI_CAP_ID_MSIX) ? "msi-x":"msi");
ret = set_irq_msi(irq, msidesc);
if (ret)
goto out_irq;
out: out:
spin_unlock(&irq_mapping_update_lock); spin_unlock(&irq_mapping_update_lock);
return irq; return irq;
out_irq:
spin_unlock(&irq_mapping_update_lock);
xen_free_irq(irq);
return -1;
} }
#endif #endif