aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen/events.c
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-02-18 11:43:28 -0500
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-03-10 14:44:35 -0500
commitbb5d079aefa828c292c267ed34ed2282947fa233 (patch)
tree0af32e6cec25bb2dc7e220e3f50ef7e7d288e83f /drivers/xen/events.c
parentae1635b05fae30804061406010914d85d12431ac (diff)
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>
Diffstat (limited to 'drivers/xen/events.c')
-rw-r--r--drivers/xen/events.c12
1 files changed, 5 insertions, 7 deletions
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)
664 return -1; 664 return -1;
665} 665}
666 666
667void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc) 667void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc_pirq)
668{ 668{
669 spin_lock(&irq_mapping_update_lock); 669 spin_lock(&irq_mapping_update_lock);
670 670
671 if (alloc & XEN_ALLOC_IRQ) { 671 *irq = xen_allocate_irq_dynamic();
672 *irq = xen_allocate_irq_dynamic(); 672 if (*irq == -1)
673 if (*irq == -1) 673 goto out;
674 goto out;
675 }
676 674
677 if (alloc & XEN_ALLOC_PIRQ) { 675 if (alloc_pirq) {
678 *pirq = find_unbound_pirq(MAP_PIRQ_TYPE_MSI); 676 *pirq = find_unbound_pirq(MAP_PIRQ_TYPE_MSI);
679 if (*pirq == -1) { 677 if (*pirq == -1) {
680 xen_free_irq(*irq); 678 xen_free_irq(*irq);