[Xen-devel] [PATCH 03/12] xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

All callers pass this flag so it is pointless.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 arch/x86/pci/xen.c   |    6 +++---
 drivers/xen/events.c |   12 +++++-------
 include/xen/events.h |    5 +----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 8e80ab3..d1b72be 100644
--- 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;
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 41a8a65..e7c6c59 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -654,17 +654,15 @@ static int find_unbound_pirq(int type)
        return -1;
 }
 
-void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc)
+void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc_pirq)
 {
        spin_lock(&irq_mapping_update_lock);
 
-       if (alloc & XEN_ALLOC_IRQ) {
-               *irq = xen_allocate_irq_dynamic();
-               if (*irq == -1)
-                       goto out;
-       }
+       *irq = xen_allocate_irq_dynamic();
+       if (*irq == -1)
+               goto out;
 
-       if (alloc & XEN_ALLOC_PIRQ) {
+       if (alloc_pirq) {
                *pirq = find_unbound_pirq(MAP_PIRQ_TYPE_MSI);
                if (*pirq == -1) {
                        xen_free_irq(*irq);
diff --git a/include/xen/events.h b/include/xen/events.h
index bd03b1e..88c738c 100644
--- a/include/xen/events.h
+++ b/include/xen/events.h
@@ -81,10 +81,7 @@ int xen_allocate_pirq(unsigned gsi, int shareable, char 
*name);
 int xen_map_pirq_gsi(unsigned pirq, unsigned gsi, int shareable, char *name);
 
 #ifdef CONFIG_PCI_MSI
-/* Allocate an irq and a pirq to be used with MSIs. */
-#define XEN_ALLOC_PIRQ (1 << 0)
-#define XEN_ALLOC_IRQ  (1 << 1)
-void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc_mask);
+void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc_pirq);
 int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int 
type);
 #endif
 
-- 
1.5.6.5


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