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: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/all/20250319105506.322536126@linutronix.de

diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c
index 17ec6332cb1d44b6462f7c5ea12e59fe00e91fc0..e6864002b8744211438604bcf9597bbd204afae3 100644 (file)
--- a/drivers/pci/msi/api.c
+++ b/drivers/pci/msi/api.c
@@ -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);
 

diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
index 6569ba3577fe6361c37764989fb818801ad4a836..3283baa257ed1d899a08ca6bf12ba217cf68c14a 100644 (file)
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -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);
-       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);
+       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);
 }