ALSA: trident: Use guard() for mutex locks

Replace the manual mutex lock/unlock pairs with guard() for code
simplification.

Only code refactoring, and no behavior change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250829144342.4290-58-tiwai@suse.de

diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c
index 4a36f194c7f8d9e70c0b6dac52e0a6d4af0e24c1..81f6348191dc4449767aec76964d103a1af320f9 100644 (file)
--- a/sound/pci/trident/trident_memory.c
+++ b/sound/pci/trident/trident_memory.c
@@ -172,12 +172,10 @@ snd_trident_alloc_sg_pages(struct snd_trident *trident,
 
        
 
-       mutex_lock(&hdr->block_mutex);
+       guard(mutex)(&hdr->block_mutex);
        blk = search_empty(hdr, runtime->dma_bytes);
-       if (blk == NULL) {
-               mutex_unlock(&hdr->block_mutex);
+       if (blk == NULL)
                return NULL;
-       }
                           
        /* set TLB entries */
        idx = 0;
@@ -186,12 +184,10 @@ snd_trident_alloc_sg_pages(struct snd_trident *trident,
                dma_addr_t addr = snd_pcm_sgbuf_get_addr(substream, ofs);
                if (!is_valid_page(trident, addr)) {
                        __snd_util_mem_free(hdr, blk);
-                       mutex_unlock(&hdr->block_mutex);
                        return NULL;
                }
                set_tlb_bus(trident, page, addr);
        }
-       mutex_unlock(&hdr->block_mutex);
        return blk;
 }
 
@@ -216,12 +212,10 @@ snd_trident_alloc_cont_pages(struct snd_trident *trident,
        if (snd_BUG_ON(!hdr))
                return NULL;
 
-       mutex_lock(&hdr->block_mutex);
+       guard(mutex)(&hdr->block_mutex);
        blk = search_empty(hdr, runtime->dma_bytes);
-       if (blk == NULL) {
-               mutex_unlock(&hdr->block_mutex);
+       if (blk == NULL)
                return NULL;
-       }
                           
        /* set TLB entries */
        addr = runtime->dma_addr;
@@ -229,12 +223,10 @@ snd_trident_alloc_cont_pages(struct snd_trident *trident,
             addr += SNDRV_TRIDENT_PAGE_SIZE) {
                if (!is_valid_page(trident, addr)) {
                        __snd_util_mem_free(hdr, blk);
-                       mutex_unlock(&hdr->block_mutex);
                        return NULL;
                }
                set_tlb_bus(trident, page, addr);
        }
-       mutex_unlock(&hdr->block_mutex);
        return blk;
 }
 
@@ -267,12 +259,11 @@ int snd_trident_free_pages(struct snd_trident *trident,
                return -EINVAL;
 
        hdr = trident->tlb.memhdr;
-       mutex_lock(&hdr->block_mutex);
+       guard(mutex)(&hdr->block_mutex);
        /* reset TLB entries */
        for (page = firstpg(blk); page <= lastpg(blk); page++)
                set_silent_tlb(trident, page);
        /* free memory block */
        __snd_util_mem_free(hdr, blk);
-       mutex_unlock(&hdr->block_mutex);
        return 0;
 }