aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-02-18 16:43:29 +0000
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-03-10 14:44:37 -0500
commit4b41df7f6e0b5684378d9155773c42a4577e8582 (patch)
tree9ef8bf6d42bb2c04d2a7a9ef3f0c7dd1f9b4861d /arch/x86
parentbb5d079aefa828c292c267ed34ed2282947fa233 (diff)
downloadkernel_samsung_espresso10-4b41df7f6e0b5684378d9155773c42a4577e8582.zip
kernel_samsung_espresso10-4b41df7f6e0b5684378d9155773c42a4577e8582.tar.gz
kernel_samsung_espresso10-4b41df7f6e0b5684378d9155773c42a4577e8582.tar.bz2
xen: events: return irq from xen_allocate_pirq_msi
consistent with other similar functions. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/pci/xen.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index ca5fa09..6fd695b 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -100,8 +100,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) |
((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, 0);
+ irq = xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ?
+ "msi-x" : "msi", &pirq, 0);
if (irq < 0)
goto error;
ret = set_irq_msi(irq, msidesc);
@@ -111,8 +111,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
" pirq=%d\n", irq, pirq);
return 0;
}
- xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ?
- "msi-x" : "msi", &irq, &pirq, 1);
+ irq = xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ?
+ "msi-x" : "msi", &pirq, 1);
if (irq < 0 || pirq < 0)
goto error;
printk(KERN_DEBUG "xen: msi --> irq=%d, pirq=%d\n", irq, pirq);
@@ -157,10 +157,10 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
goto error;
i = 0;
list_for_each_entry(msidesc, &dev->msi_list, list) {
- xen_allocate_pirq_msi(
+ irq = xen_allocate_pirq_msi(
(type == PCI_CAP_ID_MSIX) ?
"pcifront-msi-x" : "pcifront-msi",
- &irq, &v[i], 0);
+ &v[i], 0);
if (irq < 0) {
ret = -1;
goto free;