xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi

[firefly-linux-kernel-4.4.55.git] / arch / x86 / pci / xen.c

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 47c4688dcd482194ed69ee72a768d9e02069157d..ca5fa09ca56d8ad92d15209badc4a7397b3749fa 100644 (file)
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -101,7 +101,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                        ((msg.address_lo >> MSI_ADDR_DEST_ID_SHIFT) & 0xff);
                if (xen_irq_from_pirq(pirq) >= 0 && msg.data == XEN_PIRQ_MSI_DATA) {
                        xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ?
-                                       "msi-x" : "msi", &irq, &pirq, XEN_ALLOC_IRQ);
+                                       "msi-x" : "msi", &irq, &pirq, 0);
                        if (irq < 0)
                                goto error;
                        ret = set_irq_msi(irq, msidesc);
@@ -112,7 +112,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                        return 0;
                }
                xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ?
-                               "msi-x" : "msi", &irq, &pirq, (XEN_ALLOC_IRQ | XEN_ALLOC_PIRQ));
+                               "msi-x" : "msi", &irq, &pirq, 1);
                if (irq < 0 || pirq < 0)
                        goto error;
                printk(KERN_DEBUG "xen: msi --> irq=%d, pirq=%d\n", irq, pirq);
@@ -160,7 +160,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                xen_allocate_pirq_msi(
                        (type == PCI_CAP_ID_MSIX) ?
                        "pcifront-msi-x" : "pcifront-msi",
-                       &irq, &v[i], XEN_ALLOC_IRQ);
+                       &irq, &v[i], 0);
                if (irq < 0) {
                        ret = -1;
                        goto free;