| Message ID | 20221111122015.042870570@linutronix.de (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | genirq, PCI/MSI: Support for per device MSI and PCI/IMS - Part 1 cleanups | expand |
On Fri, Nov 11, 2022 at 02:54:54PM +0100, Thomas Gleixner wrote: > From: Ahmed S. Darwish <darwi@linutronix.de> > > To distangle the maze in msi.c, all exported device-driver MSI APIs are > now to be grouped in one file, api.c. > > Move pci_free_irq_vectors() and make its kernel-doc comprehensive. > > Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > drivers/pci/msi/api.c | 15 +++++++++++++++ > drivers/pci/msi/msi.c | 13 ------------- > 2 files changed, 15 insertions(+), 13 deletions(-) > --- > diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c > index 0f1ec87e3f9f..2ff2a9ccfc47 100644 > --- a/drivers/pci/msi/api.c > +++ b/drivers/pci/msi/api.c > @@ -205,3 +205,18 @@ int pci_irq_vector(struct pci_dev *dev, unsigned int nr) > return irq ? irq : -EINVAL; > } > EXPORT_SYMBOL(pci_irq_vector); > + > +/** > + * pci_free_irq_vectors() - Free previously allocated IRQs for a device > + * @dev: the PCI device to operate on > + * > + * Undo the interrupt vector allocations and possible device MSI/MSI-X > + * enablement earlier done through pci_alloc_irq_vectors_affinity() or > + * pci_alloc_irq_vectors(). > + */ > +void pci_free_irq_vectors(struct pci_dev *dev) > +{ > + pci_disable_msix(dev); > + pci_disable_msi(dev); > +} > +EXPORT_SYMBOL(pci_free_irq_vectors); > diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c > index 38ad2fe4b85c..ed8caf5ac99f 100644 > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -887,19 +887,6 @@ int __pci_enable_msix_range(struct pci_dev *dev, > } > > /** > - * pci_free_irq_vectors - free previously allocated IRQs for a device > - * @dev: PCI device to operate on > - * > - * Undoes the allocations and enabling in pci_alloc_irq_vectors(). > - */ > -void pci_free_irq_vectors(struct pci_dev *dev) > -{ > - pci_disable_msix(dev); > - pci_disable_msi(dev); > -} > -EXPORT_SYMBOL(pci_free_irq_vectors); > - > -/** > * pci_irq_get_affinity - return the affinity of a particular MSI vector > * @dev: PCI device to operate on > * @nr: device-relative interrupt vector index (0-based). >
diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c index 0f1ec87e3f9f..2ff2a9ccfc47 100644 --- a/drivers/pci/msi/api.c +++ b/drivers/pci/msi/api.c @@ -205,3 +205,18 @@ int pci_irq_vector(struct pci_dev *dev, unsigned int nr) return irq ? irq : -EINVAL; } EXPORT_SYMBOL(pci_irq_vector); + +/** + * pci_free_irq_vectors() - Free previously allocated IRQs for a device + * @dev: the PCI device to operate on + * + * Undo the interrupt vector allocations and possible device MSI/MSI-X + * enablement earlier done through pci_alloc_irq_vectors_affinity() or + * pci_alloc_irq_vectors(). + */ +void pci_free_irq_vectors(struct pci_dev *dev) +{ + pci_disable_msix(dev); + pci_disable_msi(dev); +} +EXPORT_SYMBOL(pci_free_irq_vectors); diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index 38ad2fe4b85c..ed8caf5ac99f 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -887,19 +887,6 @@ int __pci_enable_msix_range(struct pci_dev *dev, } /** - * pci_free_irq_vectors - free previously allocated IRQs for a device - * @dev: PCI device to operate on - * - * Undoes the allocations and enabling in pci_alloc_irq_vectors(). - */ -void pci_free_irq_vectors(struct pci_dev *dev) -{ - pci_disable_msix(dev); - pci_disable_msi(dev); -} -EXPORT_SYMBOL(pci_free_irq_vectors); - -/** * pci_irq_get_affinity - return the affinity of a particular MSI vector * @dev: PCI device to operate on * @nr: device-relative interrupt vector index (0-based).