summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-02-18 16:43:35 +0000
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-03-10 14:44:43 -0500
commitf420e010edd84eb2c237fc87b7451e69740fed46 (patch)
tree904e9feb634f4cd4e4dbdc7de9b0fd009a86cd28 /arch/x86/pci
parent2e55288f63343f0810f4f0a3004f78037cfb93d3 (diff)
downloadlinux-stable-f420e010edd84eb2c237fc87b7451e69740fed46.tar.gz
linux-stable-f420e010edd84eb2c237fc87b7451e69740fed46.tar.bz2
linux-stable-f420e010edd84eb2c237fc87b7451e69740fed46.zip
xen: events: push set_irq_msi down into xen_create_msi_irq
Makes the tail end of this function look even more like xen_bind_pirq_msi_to_irq. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/xen.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 93e42152d8d0..15fd981d35f1 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -185,23 +185,15 @@ static void xen_teardown_msi_irq(unsigned int irq)
#ifdef CONFIG_XEN_DOM0
static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
{
- int irq, ret;
+ int irq;
struct msi_desc *msidesc;
list_for_each_entry(msidesc, &dev->msi_list, list) {
irq = xen_create_msi_irq(dev, msidesc, type);
if (irq < 0)
return -1;
-
- ret = set_irq_msi(irq, msidesc);
- if (ret)
- goto error;
}
return 0;
-
-error:
- xen_destroy_irq(irq);
- return ret;
}
#endif
#endif