PCI: hv: Switch MSI descriptor locking to guard()

Convert the code to use the new guard(msi_descs_lock).

No functional change intended.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Michael Kelley <mhklinux@outlook.com>
Acked-by: Wei Liu <wei.liu@kernel.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/all/20250313130321.758905320@linutronix.de

diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 6084b38bdda17a8ad622108158692ffc72bf3377..715446fd26a519e2e45eb977a229f3c5501c9285 100644 (file)
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -3976,24 +3976,18 @@ static int hv_pci_restore_msi_msg(struct pci_dev *pdev, void *arg)
 {
        struct irq_data *irq_data;
        struct msi_desc *entry;
-       int ret = 0;
 
        if (!pdev->msi_enabled && !pdev->msix_enabled)
                return 0;
 
-       msi_lock_descs(&pdev->dev);
+       guard(msi_descs_lock)(&pdev->dev);
        msi_for_each_desc(entry, &pdev->dev, MSI_DESC_ASSOCIATED) {
                irq_data = irq_get_irq_data(entry->irq);
-               if (WARN_ON_ONCE(!irq_data)) {
-                       ret = -EINVAL;
-                       break;
-               }
-
+               if (WARN_ON_ONCE(!irq_data))
+                       return -EINVAL;
                hv_compose_msi_msg(irq_data, &entry->msg);
        }
-       msi_unlock_descs(&pdev->dev);
-
-       return ret;
+       return 0;
 }
 
 /*