Commit 82ff8e6b authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

PCI/MSI: Use msi_get_virq() in pci_get_vector() 



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

No functional change intended.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20211210221814.841243231@linutronix.de
parent cf15f43a

drivers/pci/msi/msi.c

+5 −20
Original line number Diff line number Diff line
@@ -1080,28 +1080,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;



		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) {

		struct msi_desc *entry = first_pci_msi_entry(dev);

	unsigned int irq;



		if (WARN_ON_ONCE(nr >= entry->nvec_used))

			return -EINVAL;

	} else {

		if (WARN_ON_ONCE(nr > 0))

			return -EINVAL;

	}

	if (!dev->msi_enabled && !dev->msix_enabled)

		return !nr ? dev->irq : -EINVAL;



	return dev->irq + nr;

	irq = msi_get_virq(&dev->dev, nr);

	return irq ? irq : -EINVAL;

}

EXPORT_SYMBOL(pci_irq_vector);