From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F023CD8CB9 for ; Wed, 10 Jun 2026 10:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ccE2EB2fnzyeaAU6yY7eDAKmvbXrjVPbtb4CUqU9a2E=; b=ST8joJsRGclOUCQDWQBTqx62z5 ITdNSNwWRam8F53NbCgpuIGYPSiEv6TVWUjeu4B8KcLMPJuXVK4T1lCmfsr1kyG+4WNQarUi8YR3c RaeRb4eNFaNiO/itePgNRu3H5j00f5NZFYDVwifH/GywLLWX0kv3R2xUdaQY5aeLhGy9otqZ5lWPv BTEx67BopHPluZAq26XBJmvai0ctQ4xtqu2YF9pEEM5o3azrJoPzsTXAHcvSPlBbE3UbheH5JpdQ7 HJ/oBBPIuuq61hYN6QqhccYFzXggD5Dfu8Y2h0F1rdUL3WK5uDg9kRhyj8IR5dF90uEenTt/HQVca 0RrMunHQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wXG3H-00000007Mr8-0lZj; Wed, 10 Jun 2026 10:20:51 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wXG3E-00000007Moi-166I for linux-mediatek@lists.infradead.org; Wed, 10 Jun 2026 10:20:49 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2bf2e8ccca1so47091015ad.0 for ; Wed, 10 Jun 2026 03:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781086847; x=1781691647; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ccE2EB2fnzyeaAU6yY7eDAKmvbXrjVPbtb4CUqU9a2E=; b=q/ARTPa8nsw94gy79M3OJDe/Z5bqM1F0vq3a2Bi0BZL4qHp2vZFxdKneZneHYRZFEW W8UDNHvnWVzmvlgl1WEITWSfZObHB+/Md85AuTd7g0DFD9PTuMY3wb4C3g6YZy70NKh1 rnZR6Pnrucx/WDJ02g6cshpQ8uHTFrnNSVoGJGmV/I4v8ti6wEamboOyuF7XiZG9BjRv cUlVb9ZUs13k+lAz2vuRZAkjDVP44ho3hPlPxOmn5DX/47gTuN5JTt0yi/Bty4CmBB3N MJpeoX4D23k+9QFeH9IdEiVE0uxpGF6S37MWb7ajK93bKDewlncn+pngO0GOnxfv2TLG Voqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781086847; x=1781691647; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ccE2EB2fnzyeaAU6yY7eDAKmvbXrjVPbtb4CUqU9a2E=; b=AMrFHQsH66sbs4Qtm4xyy76siZNA7zmryUjY1OGDErxfIzQyHaeCh5Y0ce6BvsVHVO bqP+6qBv47emOb4ACPRZ258aN9WrZ7RzV2/eUqAYyDNnwufSwpdaNlni3ylyg6HQSW4R X1UgDB9JB7eRkk4LoZx7VUnU61cTPdLeErP+kV7aELnxb/JbiUyM92r7fCoxxdHmiedc /7dqP1/hapWJT+AUc9yPTptFAUt+uX2A2SNAmYhvRBjSaFSDvjFz0HHjbSJNcnZaWEPr 728rMjQZZISUhCxOkYC2Jal6NnivGFulD+BxfknFW+DDcl7Sa+S+6zH5vUyD8y31Hf1p 0Stg== X-Forwarded-Encrypted: i=1; AFNElJ8C2zPN5DUy/Bxp9n+5ltiYX08GszTvyYexYIyD44Smd3zfU44xA3fPmJ4TiYi1+OrP3fMEDn8ngbOS2Px0bw==@lists.infradead.org X-Gm-Message-State: AOJu0YyDQ5nAStKU6BdZWjAFH9RJSer+DiONzXyZP4ZFiphAoTWwJpkR 9+mgP3uQu4rHAG9Tv/xweAf4DWab25vGyFw7QVNRD3kgGfSuP1mt/zT8 X-Gm-Gg: Acq92OHwXiJ5Iad1aQQvxV3w6hIFyar47rS2we+rLH5qIptUVtI1I+S+V2fK3giPqDs nJg50+g1tsajy3EHdq8UZHEDiN+odBwS4yK6RoLe7632NHr9+/+Dme4nuopRjI8D2ApD51j7+9q 7xNHhTZ0NbiyMmwrovpk4sKAPB2kfmbODUalWGBShTGNDm1ixRh7ZYrLU11xU+gQF20o3zdTFj4 wtIoj0cUSOdlCYB5f1HwugcFYRuAaMHEp4Skdo4zxhQqgVkodZ/9zqWBCU4eR459g13ONr1HnbG pR688KzCYSqQuzKbsS+2khMnWawnJhEKeYN2qfN0ijisA+LgMVuBs3StlpvHmSukRPDiLnnHnUV 7wKi7gG6lT/Uo3YW4DJJVHPxyMvkrdTMH4tNNGbG4+ZqjwIzJlbrHyRiaO+/B9FtKSN19Y7OXJm dNrT1zX4F1ig6H77MCTydIs7MJwXYP440oC0f6WqNXPYtv5LyYXr5nVeH3p4CR3i6JLeKq X-Received: by 2002:a17:903:b0b:b0:2b4:6080:d4d0 with SMTP id d9443c01a7336-2c1e80ec3b7mr273180005ad.22.1781086847357; Wed, 10 Jun 2026 03:20:47 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164f96b3fsm250133875ad.29.2026.06.10.03.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 03:20:46 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Matthias Brugger Cc: Liam Girdwood , AngeloGioacchino Del Regno , Linus Walleij , Bartosz Golaszewski , Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, bui duc phuc Subject: [PATCH 02/10] ASoC: mediatek: common: mtk-btcvsd: Use guard() for spin locks Date: Wed, 10 Jun 2026 17:20:13 +0700 Message-ID: <20260610102021.83273-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260610102021.83273-1-phucduc.bui@gmail.com> References: <20260610102021.83273-1-phucduc.bui@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260610_032048_316854_71957F02 X-CRM114-Status: GOOD ( 15.35 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: bui duc phuc Clean up the code using guard() for spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/mediatek/common/mtk-btcvsd.c | 81 +++++++++++--------------- 1 file changed, 35 insertions(+), 46 deletions(-) diff --git a/sound/soc/mediatek/common/mtk-btcvsd.c b/sound/soc/mediatek/common/mtk-btcvsd.c index 5e7e85b4c98a..85cfc602dfd3 100644 --- a/sound/soc/mediatek/common/mtk-btcvsd.c +++ b/sound/soc/mediatek/common/mtk-btcvsd.c @@ -319,7 +319,6 @@ static int btcvsd_tx_clean_buffer(struct mtk_btcvsd_snd *bt) { unsigned int i; unsigned int num_valid_addr; - unsigned long flags; enum BT_SCO_BAND band = bt->band; /* prepare encoded mute data */ @@ -330,7 +329,7 @@ static int btcvsd_tx_clean_buffer(struct mtk_btcvsd_snd *bt) table_msbc_silence, SCO_PACKET_180); /* write mute data to bt tx sram buffer */ - spin_lock_irqsave(&bt->tx_lock, flags); + guard(spinlock_irqsave)(&bt->tx_lock); num_valid_addr = bt->tx->buffer_info.num_valid_addr; dev_info(bt->dev, "%s(), band %d, num_valid_addr %u\n", @@ -349,7 +348,6 @@ static int btcvsd_tx_clean_buffer(struct mtk_btcvsd_snd *bt) bt->tx->buffer_info.packet_length, bt->tx->buffer_info.packet_num); } - spin_unlock_irqrestore(&bt->tx_lock, flags); return 0; } @@ -365,7 +363,6 @@ static int mtk_btcvsd_read_from_bt(struct mtk_btcvsd_snd *bt, int pv; u8 *src; unsigned int packet_buf_ofs; - unsigned long flags; unsigned long connsys_addr_rx, ap_addr_rx; connsys_addr_rx = *bt->bt_reg_pkt_r; @@ -385,7 +382,7 @@ static int mtk_btcvsd_read_from_bt(struct mtk_btcvsd_snd *bt, bt->rx->temp_packet_buf, packet_length, packet_num); - spin_lock_irqsave(&bt->rx_lock, flags); + guard(spinlock_irqsave)(&bt->rx_lock); for (i = 0; i < blk_size; i++) { packet_buf_ofs = (bt->rx->packet_w & SCO_RX_PACKET_MASK) * bt->rx->packet_size; @@ -403,7 +400,7 @@ static int mtk_btcvsd_read_from_bt(struct mtk_btcvsd_snd *bt, SCO_CVSD_PACKET_VALID_SIZE); bt->rx->packet_w++; } - spin_unlock_irqrestore(&bt->rx_lock, flags); + return 0; } @@ -414,7 +411,6 @@ static int mtk_btcvsd_write_to_bt(struct mtk_btcvsd_snd *bt, unsigned int blk_size) { unsigned int i; - unsigned long flags; u8 *dst; unsigned long connsys_addr_tx, ap_addr_tx; bool new_ap_addr_tx = true; @@ -430,17 +426,17 @@ static int mtk_btcvsd_write_to_bt(struct mtk_btcvsd_snd *bt, return -EIO; } - spin_lock_irqsave(&bt->tx_lock, flags); - for (i = 0; i < blk_size; i++) { - memcpy(bt->tx->temp_packet_buf + (bt->tx->packet_size * i), - (bt->tx_packet_buf + - (bt->tx->packet_r % SCO_TX_PACKER_BUF_NUM) * - bt->tx->packet_size), - bt->tx->packet_size); + scoped_guard(spinlock_irqsave, &bt->tx_lock) { + for (i = 0; i < blk_size; i++) { + memcpy(bt->tx->temp_packet_buf + (bt->tx->packet_size * i), + (bt->tx_packet_buf + + (bt->tx->packet_r % SCO_TX_PACKER_BUF_NUM) * + bt->tx->packet_size), + bt->tx->packet_size); - bt->tx->packet_r++; + bt->tx->packet_r++; + } } - spin_unlock_irqrestore(&bt->tx_lock, flags); dst = (u8 *)ap_addr_tx; @@ -462,11 +458,11 @@ static int mtk_btcvsd_write_to_bt(struct mtk_btcvsd_snd *bt, if (new_ap_addr_tx) { unsigned int next_idx; - spin_lock_irqsave(&bt->tx_lock, flags); - bt->tx->buffer_info.num_valid_addr++; - next_idx = bt->tx->buffer_info.num_valid_addr - 1; - bt->tx->buffer_info.bt_sram_addr[next_idx] = ap_addr_tx; - spin_unlock_irqrestore(&bt->tx_lock, flags); + scoped_guard(spinlock_irqsave, &bt->tx_lock) { + bt->tx->buffer_info.num_valid_addr++; + next_idx = bt->tx->buffer_info.num_valid_addr - 1; + bt->tx->buffer_info.bt_sram_addr[next_idx] = ap_addr_tx; + } dev_info(bt->dev, "%s(), new ap_addr_tx = 0x%lx, num_valid_addr %d\n", __func__, ap_addr_tx, bt->tx->buffer_info.num_valid_addr); @@ -701,17 +697,16 @@ static ssize_t mtk_btcvsd_snd_read(struct mtk_btcvsd_snd *bt, { ssize_t read_size = 0, read_count = 0, cur_read_idx, cont; unsigned long avail; - unsigned long flags; unsigned int packet_size = bt->rx->packet_size; while (count) { - spin_lock_irqsave(&bt->rx_lock, flags); - /* available data in RX packet buffer */ - avail = (bt->rx->packet_w - bt->rx->packet_r) * packet_size; + scoped_guard(spinlock_irqsave, &bt->rx_lock) { + /* available data in RX packet buffer */ + avail = (bt->rx->packet_w - bt->rx->packet_r) * packet_size; - cur_read_idx = (bt->rx->packet_r & SCO_RX_PACKET_MASK) * - packet_size; - spin_unlock_irqrestore(&bt->rx_lock, flags); + cur_read_idx = (bt->rx->packet_r & SCO_RX_PACKET_MASK) * + packet_size; + } if (!avail) { int ret = wait_for_bt_irq(bt, bt->rx); @@ -749,9 +744,8 @@ static ssize_t mtk_btcvsd_snd_read(struct mtk_btcvsd_snd *bt, return -EFAULT; } - spin_lock_irqsave(&bt->rx_lock, flags); - bt->rx->packet_r += read_size / packet_size; - spin_unlock_irqrestore(&bt->rx_lock, flags); + scoped_guard(spinlock_irqsave, &bt->rx_lock) + bt->rx->packet_r += read_size / packet_size; read_count += read_size; count -= read_size; @@ -778,7 +772,6 @@ static ssize_t mtk_btcvsd_snd_write(struct mtk_btcvsd_snd *bt, size_t count) { int written_size = count, avail, cur_write_idx, write_size, cont; - unsigned long flags; unsigned int packet_size = bt->tx->packet_size; /* @@ -794,14 +787,14 @@ static ssize_t mtk_btcvsd_snd_write(struct mtk_btcvsd_snd *bt, bt->tx->buf_data_equivalent_time *= 1000; while (count) { - spin_lock_irqsave(&bt->tx_lock, flags); - /* free space of TX packet buffer */ - avail = bt->tx->buf_size - - (bt->tx->packet_w - bt->tx->packet_r) * packet_size; + scoped_guard(spinlock_irqsave, &bt->tx_lock) { + /* free space of TX packet buffer */ + avail = bt->tx->buf_size - + (bt->tx->packet_w - bt->tx->packet_r) * packet_size; - cur_write_idx = (bt->tx->packet_w % SCO_TX_PACKER_BUF_NUM) * - packet_size; - spin_unlock_irqrestore(&bt->tx_lock, flags); + cur_write_idx = (bt->tx->packet_w % SCO_TX_PACKER_BUF_NUM) * + packet_size; + } if (!avail) { int ret = wait_for_bt_irq(bt, bt->tx); @@ -838,9 +831,8 @@ static ssize_t mtk_btcvsd_snd_write(struct mtk_btcvsd_snd *bt, return -EFAULT; } - spin_lock_irqsave(&bt->tx_lock, flags); - bt->tx->packet_w += write_size / packet_size; - spin_unlock_irqrestore(&bt->tx_lock, flags); + scoped_guard(spinlock_irqsave, &bt->tx_lock) + bt->tx->packet_w += write_size / packet_size; count -= write_size; } @@ -985,7 +977,6 @@ static snd_pcm_uframes_t mtk_pcm_btcvsd_pointer( int hw_packet_ptr; int packet_diff; spinlock_t *lock; /* spinlock for bt stream control */ - unsigned long flags; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { lock = &bt->tx_lock; @@ -995,7 +986,7 @@ static snd_pcm_uframes_t mtk_pcm_btcvsd_pointer( bt_stream = bt->rx; } - spin_lock_irqsave(lock, flags); + guard(spinlock_irqsave)(lock); hw_packet_ptr = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? bt->tx->packet_r : bt->rx->packet_w; @@ -1018,8 +1009,6 @@ static snd_pcm_uframes_t mtk_pcm_btcvsd_pointer( bt_stream->prev_frame = frame; - spin_unlock_irqrestore(lock, flags); - return frame; } -- 2.43.0