github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

PCI/MSI: Use __free() for affinity masks

Browse Source 
Let cleanup handle the freeing of the affinity mask. That prepares for
switching the MSI descriptor locking to a guard().

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/all/20250319105506.444764312@linutronix.de
This commit is contained in:
Thomas Gleixner 2025-03-19 11:56:50 +01:00
parent b0c44a5ec3
commit 5c0ba4f9d2
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/pci/msi/msi.c
View File

@ -350,7 +350,6 @@ static int msi_verify_entries(struct pci_dev *dev)
static int msi_capability_init(struct pci_dev *dev, int nvec,
struct irq_affinity *affd)
{
struct irq_affinity_desc *masks = NULL;
struct msi_desc *entry, desc;
int ret;
@ -361,8 +360,8 @@ static int msi_capability_init(struct pci_dev *dev, int nvec,
/* Disable MSI during setup in the hardware to erase stale state */
pci_msi_set_enable(dev, 0);
if (affd)
masks = irq_create_affinity_masks(nvec, affd);
struct irq_affinity_desc *masks __free(kfree) =
affd ? irq_create_affinity_masks(nvec, affd) : NULL;
msi_lock_descs(&dev->dev);
ret = msi_setup_msi_desc(dev, nvec, masks);
@ -402,7 +401,6 @@ static int msi_capability_init(struct pci_dev *dev, int nvec,
pci_free_msi_irqs(dev);
unlock:
msi_unlock_descs(&dev->dev);
kfree(masks);
return ret;
}
@ -661,12 +659,10 @@ static void msix_mask_all(void __iomem *base, int tsize)
static int msix_setup_interrupts(struct pci_dev *dev, struct msix_entry *entries,
int nvec, struct irq_affinity *affd)
{
struct irq_affinity_desc *masks = NULL;
struct irq_affinity_desc *masks __free(kfree) =
affd ? irq_create_affinity_masks(nvec, affd) : NULL;
int ret;
if (affd)
masks = irq_create_affinity_masks(nvec, affd);
msi_lock_descs(&dev->dev);
ret = msix_setup_msi_descs(dev, entries, nvec, masks);
if (ret)
@ -688,7 +684,6 @@ static int msix_setup_interrupts(struct pci_dev *dev, struct msix_entry *entries
pci_free_msi_irqs(dev);
out_unlock:
msi_unlock_descs(&dev->dev);
kfree(masks);
return ret;
}