diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2025-03-13 14:03:41 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2025-03-13 18:57:59 +0100 |
| commit | 211ea774889ace9988d28af4f19e865ac712a150 (patch) | |
| tree | 856fd8885e67552153539f57ce7b99d23a6cbc11 | |
| parent | 5c99e0226eccb11738a30e27454157e63dcf2b52 (diff) | |
| download | linux-stable-211ea774889ace9988d28af4f19e865ac712a150.tar.gz linux-stable-211ea774889ace9988d28af4f19e865ac712a150.tar.bz2 linux-stable-211ea774889ace9988d28af4f19e865ac712a150.zip | |
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/20250313130321.568379110@linutronix.de
| -rw-r--r-- | drivers/soc/ti/ti_sci_inta_msi.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/soc/ti/ti_sci_inta_msi.c b/drivers/soc/ti/ti_sci_inta_msi.c index c36364522157..193266f5e3f9 100644 --- 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); |