aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/xen.c
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-02-18 11:43:35 -0500
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-03-10 14:44:43 -0500
commitf420e010edd84eb2c237fc87b7451e69740fed46 (patch)
tree904e9feb634f4cd4e4dbdc7de9b0fd009a86cd28 /arch/x86/pci/xen.c
parent2e55288f63343f0810f4f0a3004f78037cfb93d3 (diff)
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/xen.c')
-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)
185#ifdef CONFIG_XEN_DOM0 185#ifdef CONFIG_XEN_DOM0
186static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 186static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
187{ 187{
188 int irq, ret; 188 int irq;
189 struct msi_desc *msidesc; 189 struct msi_desc *msidesc;
190 190
191 list_for_each_entry(msidesc, &dev->msi_list, list) { 191 list_for_each_entry(msidesc, &dev->msi_list, list) {
192 irq = xen_create_msi_irq(dev, msidesc, type); 192 irq = xen_create_msi_irq(dev, msidesc, type);
193 if (irq < 0) 193 if (irq < 0)
194 return -1; 194 return -1;
195
196 ret = set_irq_msi(irq, msidesc);
197 if (ret)
198 goto error;
199 } 195 }
200 return 0; 196 return 0;
201
202error:
203 xen_destroy_irq(irq);
204 return ret;
205} 197}
206#endif 198#endif
207#endif 199#endif