diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2025-03-19 11:56:50 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2025-04-09 20:47:30 +0200 |
| commit | 5c0ba4f9d25eb35a8ef882115c9f9c2084acc4e7 (patch) | |
| tree | f255d2dbd2578d2c875ae6e88c5a94b4e9b7fd6e | |
| parent | b0c44a5ec3552f89c47dac9903d99c22d796d87f (diff) | |
PCI/MSI: Use __free() for affinity masks
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
| -rw-r--r-- | drivers/pci/msi/msi.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index c26e51682a4a..85c2aba93f18 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -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 @@ err: 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 @@ out_free: pci_free_msi_irqs(dev); out_unlock: msi_unlock_descs(&dev->dev); - kfree(masks); return ret; } |