[patch V3 27/35] PCI/MSI: Use __msi_get_virq() in pci_get_vector()

[Thomas Gleixner <tglx@xxxxxxxxxxxxx>]

From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

Use msi_get_vector() and handle the return value to be compatible.

No functional change intended.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
V2: Handle the INTx case directly instead of trying to be overly smart - Marc
---
 drivers/pci/msi/msi.c |   25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -1037,28 +1037,13 @@ EXPORT_SYMBOL(pci_free_irq_vectors);
  */
 int pci_irq_vector(struct pci_dev *dev, unsigned int nr)
 {
-       if (dev->msix_enabled) {
-               struct msi_desc *entry;
+       unsigned int irq;
 
-               for_each_pci_msi_entry(entry, dev) {
-                       if (entry->msi_index == nr)
-                               return entry->irq;
-               }
-               WARN_ON_ONCE(1);
-               return -EINVAL;
-       }
+       if (!dev->msi_enabled && !dev->msix_enabled)
+               return !nr ? dev->irq : -EINVAL;
 
-       if (dev->msi_enabled) {
-               struct msi_desc *entry = first_pci_msi_entry(dev);
-
-               if (WARN_ON_ONCE(nr >= entry->nvec_used))
-                       return -EINVAL;
-       } else {
-               if (WARN_ON_ONCE(nr > 0))
-                       return -EINVAL;
-       }
-
-       return dev->irq + nr;
+       irq = msi_get_virq(&dev->dev, nr);
+       return irq ? irq : -EINVAL;
 }
 EXPORT_SYMBOL(pci_irq_vector);