mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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: Thomas Gleixner <tglx@linutronix.de> Tested-by: Michael Kelley <mikelley@microsoft.com> Tested-by: Nishanth Menon <nm@ti.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Link: https://lore.kernel.org/r/20211210221814.841243231@linutronix.de
This commit is contained in:
		
							parent
							
								
									cf15f43aca
								
							
						
					
					
						commit
						82ff8e6b78
					
				
					 1 changed files with 5 additions and 20 deletions
				
			
		| 
						 | 
				
			
			@ -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;
 | 
			
		||||
	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);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue