Commit 497f68cf authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

PCI/MSI: Use guard(msi_desc_lock) where applicable 



Convert the trivial cases of msi_desc_lock/unlock() pairs.

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/all/20250319105506.322536126@linutronix.de
parent 8f3315cf

drivers/pci/msi/api.c

+2 −4
Original line number Diff line number Diff line
@@ -53,10 +53,9 @@ void pci_disable_msi(struct pci_dev *dev) 
	if (!pci_msi_enabled() || !dev || !dev->msi_enabled)

		return;



	msi_lock_descs(&dev->dev);

	guard(msi_descs_lock)(&dev->dev);

	pci_msi_shutdown(dev);

	pci_free_msi_irqs(dev);

	msi_unlock_descs(&dev->dev);

}

EXPORT_SYMBOL(pci_disable_msi);
@@ -196,10 +195,9 @@ void pci_disable_msix(struct pci_dev *dev) 
	if (!pci_msi_enabled() || !dev || !dev->msix_enabled)

		return;



	msi_lock_descs(&dev->dev);

	guard(msi_descs_lock)(&dev->dev);

	pci_msix_shutdown(dev);

	pci_free_msi_irqs(dev);

	msi_unlock_descs(&dev->dev);

}

EXPORT_SYMBOL(pci_disable_msix);

drivers/pci/msi/msi.c

+6 −6
Original line number Diff line number Diff line
@@ -870,13 +870,13 @@ void __pci_restore_msix_state(struct pci_dev *dev) 


	write_msg = arch_restore_msi_irqs(dev);



	msi_lock_descs(&dev->dev);

	scoped_guard (msi_descs_lock, &dev->dev) {

		msi_for_each_desc(entry, &dev->dev, MSI_DESC_ALL) {

			if (write_msg)

				__pci_write_msi_msg(entry, &entry->msg);

			pci_msix_write_vector_ctrl(entry, entry->pci.msix_ctrl);

		}

	msi_unlock_descs(&dev->dev);

	}



	pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0);

}