summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-02-18 16:43:28 +0000
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-03-10 14:44:35 -0500
commitbb5d079aefa828c292c267ed34ed2282947fa233 (patch)
tree0af32e6cec25bb2dc7e220e3f50ef7e7d288e83f
parentae1635b05fae30804061406010914d85d12431ac (diff)
downloadlinux-bb5d079aefa828c292c267ed34ed2282947fa233.tar.gz
linux-bb5d079aefa828c292c267ed34ed2282947fa233.tar.bz2
linux-bb5d079aefa828c292c267ed34ed2282947fa233.zip
xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi
All callers pass this flag so it is pointless. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--arch/x86/pci/xen.c6
-rw-r--r--drivers/xen/events.c12
-rw-r--r--include/xen/events.h5
3 files changed, 9 insertions, 14 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 47c4688dcd48..ca5fa09ca56d 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 bce303590075..36e9adcdebe9 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -664,17 +664,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 00f53ddcc062..8d98861e4d92 100644
--- a/include/xen/events.h
+++ b/include/xen/events.h
@@ -75,10 +75,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