[Xen-devel] [PATCH 10/12] xen: events: push set_irq_msi down into xen_create_msi_irq

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

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

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 arch/x86/pci/xen.c   |   10 +---------
 drivers/xen/events.c |   10 +++++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 2b915c1..df178a7 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -182,23 +182,15 @@ static void xen_teardown_msi_irq(unsigned int irq)
 #ifdef CONFIG_XEN_DOM0
 static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
-       int irq, ret;
+       int irq;
        struct msi_desc *msidesc;
 
        list_for_each_entry(msidesc, &dev->msi_list, list) {
                irq = xen_create_msi_irq(dev, msidesc, type);
                if (irq < 0)
                        return -1;
-
-               ret = set_irq_msi(irq, msidesc);
-               if (ret)
-                       goto error;
        }
        return 0;
-
-error:
-       xen_destroy_irq(irq);
-       return ret;
 }
 #endif
 #endif
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index db115ff..d4d0987 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -681,7 +681,7 @@ error_irq:
 
 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;
        int rc;
        int pos;
@@ -726,9 +726,17 @@ int xen_create_msi_irq(struct pci_dev *dev, struct 
msi_desc *msidesc, int type)
                        handle_level_irq,
                        (type == PCI_CAP_ID_MSIX) ? "msi-x":"msi");
 
+       ret = set_irq_msi(irq, msidesc);
+       if (ret)
+               goto out_irq;
+
 out:
        spin_unlock(&irq_mapping_update_lock);
        return irq;
+out_irq:
+       spin_unlock(&irq_mapping_update_lock);
+       xen_free_irq(irq);
+       return -1;
 }
 #endif
 
-- 
1.5.6.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel