aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen
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 /drivers/xen
parentxen: events: do not leak IRQ from xen_allocate_pirq_msi when no pirq available. (diff)
downloadlinux-dev-bb5d079aefa828c292c267ed34ed2282947fa233.tar.xz
linux-dev-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>
Diffstat (limited to 'drivers/xen')
-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)
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);