irqchip/alpine-msi: Convert to lock guards

Convert lock/unlock pairs to guards and tidy up the code.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/7886b9595aaf8e102f79364784f68dec9c49b023.1750860131.git.namcao@linutronix.de

diff --git a/drivers/irqchip/irq-alpine-msi.c b/drivers/irqchip/irq-alpine-msi.c
index 7e379a6985a6a661e8c1709d25dcd7cf12aa83e7..cf188e5feefc021aca4036c04f496f2ca1e7f2ef 100644 (file)
--- a/drivers/irqchip/irq-alpine-msi.c
+++ b/drivers/irqchip/irq-alpine-msi.c
@@ -60,19 +60,12 @@ static int alpine_msix_allocate_sgi(struct alpine_msix_data *priv, int num_req)
 {
        int first;
 
-       spin_lock(&priv->msi_map_lock);
-
-       first = bitmap_find_next_zero_area(priv->msi_map, priv->num_spis, 0,
-                                          num_req, 0);
-       if (first >= priv->num_spis) {
-               spin_unlock(&priv->msi_map_lock);
+       guard(spinlock)(&priv->msi_map_lock);
+       first = bitmap_find_next_zero_area(priv->msi_map, priv->num_spis, 0, num_req, 0);
+       if (first >= priv->num_spis)
                return -ENOSPC;
-       }
 
        bitmap_set(priv->msi_map, first, num_req);
-
-       spin_unlock(&priv->msi_map_lock);
-
        return priv->spi_first + first;
 }
 
@@ -80,11 +73,8 @@ static void alpine_msix_free_sgi(struct alpine_msix_data *priv, unsigned int sgi
 {
        int first = sgi - priv->spi_first;
 
-       spin_lock(&priv->msi_map_lock);
-
+       guard(spinlock)(&priv->msi_map_lock);
        bitmap_clear(priv->msi_map, first, num_req);
-
-       spin_unlock(&priv->msi_map_lock);
 }
 
 static void alpine_msix_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)