soc: ti: ti_sci_inta_msi: 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>
Tested-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Dhruva Gole <d-gole@ti.com>
Link: https://lore.kernel.org/all/20250319105506.203802081@linutronix.de

diff --git a/drivers/soc/ti/ti_sci_inta_msi.c b/drivers/soc/ti/ti_sci_inta_msi.c
index c363645221573cf467940f07cc1e31864a0363bd..193266f5e3f96038c4f61fc05d017e300d319244 100644 (file)
--- a/drivers/soc/ti/ti_sci_inta_msi.c
+++ b/drivers/soc/ti/ti_sci_inta_msi.c
@@ -103,19 +103,15 @@ int ti_sci_inta_msi_domain_alloc_irqs(struct device *dev,
        if (ret)
                return ret;
 
-       msi_lock_descs(dev);
+       guard(msi_descs_lock)(dev);
        nvec = ti_sci_inta_msi_alloc_descs(dev, res);
-       if (nvec <= 0) {
-               ret = nvec;
-               goto unlock;
-       }
+       if (nvec <= 0)
+               return nvec;
 
        /* Use alloc ALL as it's unclear whether there are gaps in the indices */
        ret = msi_domain_alloc_irqs_all_locked(dev, MSI_DEFAULT_DOMAIN, nvec);
        if (ret)
                dev_err(dev, "Failed to allocate IRQs %d\n", ret);
-unlock:
-       msi_unlock_descs(dev);
        return ret;
 }
 EXPORT_SYMBOL_GPL(ti_sci_inta_msi_domain_alloc_irqs);