aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2016-02-11 16:10:25 -0500
committerDavid Vrabel <david.vrabel@citrix.com>2016-02-15 09:21:18 -0500
commit2cfec6a2f989d5c921ba11a329ff8ea986702b9b (patch)
tree3fa582bd30ee104927ad66fc96ba66ea6f712043
parentd159457b84395927b5a52adb72f748dd089ad5e5 (diff)
xen/pcifront: Report the errors better.
The messages should be different depending on the type of error. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
-rw-r--r--arch/x86/include/asm/xen/pci.h4
-rw-r--r--arch/x86/pci/xen.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
index 968d57dd54c9..f320ee32d5a1 100644
--- a/arch/x86/include/asm/xen/pci.h
+++ b/arch/x86/include/asm/xen/pci.h
@@ -57,7 +57,7 @@ static inline int xen_pci_frontend_enable_msi(struct pci_dev *dev,
57{ 57{
58 if (xen_pci_frontend && xen_pci_frontend->enable_msi) 58 if (xen_pci_frontend && xen_pci_frontend->enable_msi)
59 return xen_pci_frontend->enable_msi(dev, vectors); 59 return xen_pci_frontend->enable_msi(dev, vectors);
60 return -ENODEV; 60 return -ENOSYS;
61} 61}
62static inline void xen_pci_frontend_disable_msi(struct pci_dev *dev) 62static inline void xen_pci_frontend_disable_msi(struct pci_dev *dev)
63{ 63{
@@ -69,7 +69,7 @@ static inline int xen_pci_frontend_enable_msix(struct pci_dev *dev,
69{ 69{
70 if (xen_pci_frontend && xen_pci_frontend->enable_msix) 70 if (xen_pci_frontend && xen_pci_frontend->enable_msix)
71 return xen_pci_frontend->enable_msix(dev, vectors, nvec); 71 return xen_pci_frontend->enable_msix(dev, vectors, nvec);
72 return -ENODEV; 72 return -ENOSYS;
73} 73}
74static inline void xen_pci_frontend_disable_msix(struct pci_dev *dev) 74static inline void xen_pci_frontend_disable_msix(struct pci_dev *dev)
75{ 75{
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index ff31ab464213..beac4dfdade6 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -196,7 +196,10 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
196 return 0; 196 return 0;
197 197
198error: 198error:
199 dev_err(&dev->dev, "Xen PCI frontend has not registered MSI/MSI-X support!\n"); 199 if (ret == -ENOSYS)
200 dev_err(&dev->dev, "Xen PCI frontend has not registered MSI/MSI-X support!\n");
201 else if (ret)
202 dev_err(&dev->dev, "Xen PCI frontend error: %d!\n", ret);
200free: 203free:
201 kfree(v); 204 kfree(v);
202 return ret; 205 return ret;