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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 48337CD98DA for ; Mon, 15 Jun 2026 09:40:59 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4gf4qs00VTz3bx0; Mon, 15 Jun 2026 19:40:57 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2607:f8b0:4864:20::535" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1781516456; cv=none; b=ECYRYXNuWQ8f4xyXpUBekVqEOdZEyNvWtqQbwVpq8M7fADeRPbTX4ViEebjUjh8BOhdN0E/IJ3mpJtjXsu2e0wq5ClngNSqlIckJJqYUlzt5JOb1XHHdfCjMyZbk1O7yFdBGo4m1KrL3TvCmpkt9X99PQSx8OsrZ3oykPpvqHaH6vFIIxHW9yk6w7XKsilb3H0+HnyYP0O8dzcH+F/cZtfpzQrbC+qpWWZEFH2k9k4PcvopZCnfixaFOcb/lV/w1YuAzhuEqVom5JR2QP3KjSD7JRLqWr6fl0syeSPsoC7jyDJE9x7BAhHgGN83wPPWz+ocmHx/74uM2ypjHJK5TAQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1781516456; c=relaxed/relaxed; bh=5EUVrIUd9a5W03H8en3F5BUxu9fsoDVhajTiBFAwOuM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DMoULvaRXn75jQjYuQ6Rd5rSb2VG6fKy/wR7shtZjOCVVK60SQokff71zs/+7OnhJlEoW1mzDZ+acqIgIMZRu2aL6Fc9vaU4EAmS5J6WgOPtCsbd0iMSi1d30VxxvVLoHHPNoP+VxdZqF0xJm6kGsUkr4G3pkGnfEDh3vnNxBGuOdHG4C1meICHJ8wrsTbfqFz6+ERk7VzxU2ycVebMKDmIngvn1UnbWBvZLKUwUrY10qOXU9nxbNryOsSBIoV8nJPFMjzQvtYxXstUDIErYmS9Bfg0pT2cLotTh8pLKLQJUKZsfatLw4MwPxnSUmWiynENL7/GEKHTl1p2l3KxXdw== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=VHAifQfG; dkim-atps=neutral; spf=pass (client-ip=2607:f8b0:4864:20::535; helo=mail-pg1-x535.google.com; envelope-from=phucduc.bui@gmail.com; receiver=lists.ozlabs.org) smtp.mailfrom=gmail.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=VHAifQfG; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::535; helo=mail-pg1-x535.google.com; envelope-from=phucduc.bui@gmail.com; receiver=lists.ozlabs.org) Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4gf4qr2DWYz3bww for ; Mon, 15 Jun 2026 19:40:56 +1000 (AEST) Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-c858cc9870aso1501401a12.0 for ; Mon, 15 Jun 2026 02:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781516454; x=1782121254; darn=lists.ozlabs.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=5EUVrIUd9a5W03H8en3F5BUxu9fsoDVhajTiBFAwOuM=; b=VHAifQfGD975hmpw72ivtzRd/viou3eMPunCeC/5LOc9teX+wne4NFPZlidjMA8giz Is9EolPWq1vBV3aW3uHzi0X23yMcWNBp5lUaKlOwNiWDfMGw6wyq9nEchOMYx5578Zk+ 4c7FDDAnen7S9EnHQVg7m889ScxxebgVfHBoED3D8WxsYG/lI7leHJWpTbd58Tfu9Ycr B5dGrS3DA8aBUVrf8MlbeCHJg/1MPZbsGzw72GOzq9FEkStkvUrmur4GUZuIZRLC46l3 ksAu9QGtyP7xUeSzf7KK47NtUAV7AWqChCwo+CAggH2R0u2jwWNVP7uXWPtTStDOYrY5 B3fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781516454; x=1782121254; 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=5EUVrIUd9a5W03H8en3F5BUxu9fsoDVhajTiBFAwOuM=; b=BSCGaLZJMFJXkqzz2/K8UXQNY7sZBnMEoqtKD3C8GFv9PP63H2rNsZVo8IQqzqsjK7 D3fGuVMv+QlF7qyNXdjza6ih+KjBLFS7h66TmgWLmYzU+cG5ej0oUE5aQpdqdmEM2S6E Mf0p2pSKQBT1NV9jh/ggNK8UkbfgsCBAFhHPIEu5v4lYSUswH6dLvefgAjTN1BH2TLLi hAsZtPWw3A3fcME4xzxIlkV6VO+I2kb7W32sPXm05+GikjUuA7OjUeaiTfxMFKReDRow RVl73NCPWn3o/uR0lVpbQnax6Z5bJNBMflMNZX6jP4jURaPOF7yz2By7yp8uc32Bvmkx fEVA== X-Forwarded-Encrypted: i=1; AFNElJ9xa7uSg5uJ/WHbhrWsnzC357X+v6nCrdxTirWm2yAJRjAXlcMXJS8/acv2IWd9EH27CIRMljcniuDsuk8=@lists.ozlabs.org X-Gm-Message-State: AOJu0YzM/OnsYgncDV6JtpZ1g/efb4QLDsyZZsj9giWvvdaWopQH9lXz IqMZFXT/9MW00ly9Zrc0Ih6xdhmKxG0J8q2mFUkJ8PhTRx3IraeQQeo/ X-Gm-Gg: Acq92OGkHM7qwyLX0Z15A1IGib1CMJG5wE66iYCJGe0bmsgIfRGTcZOPOc1r2Eh2jkC VxtIF2FSRh9r5Mw9CS9elGyRmMtja/S/YplIyp+WAzuKkvJrk2DUBLbumFEQQwjJlrKrUNDKTsR m7ssOa0XpqJ3VAkswWKR1ReCVcro1KOGu6B7n8nNg5eLmjXfqE648yRP2xjM0ynlTuxNGgMe5pz DuV0CAs3K3daffdRCqtA3VC8TjgU4OBAvaIqKt9AWnHhi7NZTykFOzr6bl/Nhkjfx9tR6lDt+1D aLCYroNlRGfhgXHlxnVDJASzryab1joICPmMmh2l8TeYDHY1zb0jy68VoSB16+zj/kGeZ2c+r0y Khifq4wrP0sol8k9nwzRJqW26uEYx/8UlECGdojxlV0zuEELEHoODYwp3jSsgAhjhE6Eb5bGq+V oxVaHjBzr8Wfb+tOaIoOaaelZnEm28rrSa169cFC8EnpAJZCKepGkDNqkZmw== X-Received: by 2002:a17:90b:1dce:b0:369:7491:7b24 with SMTP id 98e67ed59e1d1-379ed8e27d2mr11149280a91.6.1781516454144; Mon, 15 Jun 2026 02:40:54 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37a1eba8e9asm9936290a91.2.2026.06.15.02.40.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 02:40:52 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Xiubo Li , Frank Li , Fabio Estevam , Nicolin Chen , Sascha Hauer , Pengutronix Kernel Team , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, bui duc phuc Subject: [PATCH v2 09/11] ASoC: fsl_rpmsg: Use guard() for mutex & spin locks Date: Mon, 15 Jun 2026 16:38:22 +0700 Message-ID: <20260615093824.115751-10-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260615093824.115751-1-phucduc.bui@gmail.com> References: <20260615093824.115751-1-phucduc.bui@gmail.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc Clean up the code using guard() for mutex & spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/fsl/imx-pcm-rpmsg.c | 69 +++++++++++++++-------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c index 031e5272215d..7210393dfa5d 100644 --- a/sound/soc/fsl/imx-pcm-rpmsg.c +++ b/sound/soc/fsl/imx-pcm-rpmsg.c @@ -39,10 +39,9 @@ static int imx_rpmsg_pcm_send_message(struct rpmsg_msg *msg, struct rpmsg_device *rpdev = info->rpdev; int ret = 0; - mutex_lock(&info->msg_lock); + guard(mutex)(&info->msg_lock); if (!rpdev) { dev_err(info->dev, "rpmsg channel not ready\n"); - mutex_unlock(&info->msg_lock); return -EINVAL; } @@ -55,15 +54,12 @@ static int imx_rpmsg_pcm_send_message(struct rpmsg_msg *msg, sizeof(struct rpmsg_s_msg)); if (ret) { dev_err(&rpdev->dev, "rpmsg_send failed: %d\n", ret); - mutex_unlock(&info->msg_lock); return ret; } /* No receive msg for TYPE_C command */ - if (msg->s_msg.header.type == MSG_TYPE_C) { - mutex_unlock(&info->msg_lock); + if (msg->s_msg.header.type == MSG_TYPE_C) return 0; - } /* wait response from rpmsg */ ret = wait_for_completion_timeout(&info->cmd_complete, @@ -71,7 +67,6 @@ static int imx_rpmsg_pcm_send_message(struct rpmsg_msg *msg, if (!ret) { dev_err(&rpdev->dev, "rpmsg_send cmd %d timeout!\n", msg->s_msg.header.cmd); - mutex_unlock(&info->msg_lock); return -ETIMEDOUT; } @@ -100,8 +95,6 @@ static int imx_rpmsg_pcm_send_message(struct rpmsg_msg *msg, dev_dbg(&rpdev->dev, "cmd:%d, resp %d\n", msg->s_msg.header.cmd, info->r_msg.param.resp); - mutex_unlock(&info->msg_lock); - return 0; } @@ -109,14 +102,13 @@ static int imx_rpmsg_insert_workqueue(struct snd_pcm_substream *substream, struct rpmsg_msg *msg, struct rpmsg_info *info) { - unsigned long flags; int ret = 0; /* * Queue the work to workqueue. * If the queue is full, drop the message. */ - spin_lock_irqsave(&info->wq_lock, flags); + guard(spinlock_irqsave)(&info->wq_lock); if (info->work_write_index != info->work_read_index) { int index = info->work_write_index; @@ -130,7 +122,6 @@ static int imx_rpmsg_insert_workqueue(struct snd_pcm_substream *substream, info->msg_drop_count[substream->stream]++; ret = -EPIPE; } - spin_unlock_irqrestore(&info->wq_lock, flags); return ret; } @@ -523,7 +514,6 @@ static int imx_rpmsg_pcm_ack(struct snd_soc_component *component, snd_pcm_sframes_t avail; struct timer_list *timer; struct rpmsg_msg *msg; - unsigned long flags; int buffer_tail = 0; int written_num; @@ -553,11 +543,11 @@ static int imx_rpmsg_pcm_ack(struct snd_soc_component *component, msg->s_msg.param.buffer_tail = buffer_tail; /* The notification message is updated to latest */ - spin_lock_irqsave(&info->lock[substream->stream], flags); - memcpy(&info->notify[substream->stream], msg, - sizeof(struct rpmsg_s_msg)); - info->notify_updated[substream->stream] = true; - spin_unlock_irqrestore(&info->lock[substream->stream], flags); + scoped_guard(spinlock_irqsave, &info->lock[substream->stream]) { + memcpy(&info->notify[substream->stream], msg, + sizeof(struct rpmsg_s_msg)); + info->notify_updated[substream->stream] = true; + } if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) avail = snd_pcm_playback_hw_avail(runtime); @@ -640,7 +630,7 @@ static void imx_rpmsg_pcm_work(struct work_struct *work) bool is_notification = false; struct rpmsg_info *info; struct rpmsg_msg msg; - unsigned long flags; + bool updated; work_of_rpmsg = container_of(work, struct work_of_rpmsg, work); info = work_of_rpmsg->info; @@ -651,25 +641,26 @@ static void imx_rpmsg_pcm_work(struct work_struct *work) * enough data in M core side, need to let M core know * data is updated immediately. */ - spin_lock_irqsave(&info->lock[TX], flags); - if (info->notify_updated[TX]) { - memcpy(&msg, &info->notify[TX], sizeof(struct rpmsg_s_msg)); - info->notify_updated[TX] = false; - spin_unlock_irqrestore(&info->lock[TX], flags); - info->send_message(&msg, info); - } else { - spin_unlock_irqrestore(&info->lock[TX], flags); + scoped_guard(spinlock_irqsave, &info->lock[TX]) { + updated = info->notify_updated[TX]; + if (updated) { + memcpy(&msg, &info->notify[TX], sizeof(struct rpmsg_s_msg)); + info->notify_updated[TX] = false; + } } - - spin_lock_irqsave(&info->lock[RX], flags); - if (info->notify_updated[RX]) { - memcpy(&msg, &info->notify[RX], sizeof(struct rpmsg_s_msg)); - info->notify_updated[RX] = false; - spin_unlock_irqrestore(&info->lock[RX], flags); + if (updated) info->send_message(&msg, info); - } else { - spin_unlock_irqrestore(&info->lock[RX], flags); + + scoped_guard(spinlock_irqsave, &info->lock[RX]) { + updated = info->notify_updated[RX]; + if (updated) { + memcpy(&msg, &info->notify[RX], sizeof(struct rpmsg_s_msg)); + info->notify_updated[RX] = false; + } } + if (updated) + info->send_message(&msg, info); + /* Skip the notification message for it has been processed above */ if (work_of_rpmsg->msg.s_msg.header.type == MSG_TYPE_C && @@ -681,10 +672,10 @@ static void imx_rpmsg_pcm_work(struct work_struct *work) info->send_message(&work_of_rpmsg->msg, info); /* update read index */ - spin_lock_irqsave(&info->wq_lock, flags); - info->work_read_index++; - info->work_read_index %= WORK_MAX_NUM; - spin_unlock_irqrestore(&info->wq_lock, flags); + scoped_guard(spinlock_irqsave, &info->wq_lock) { + info->work_read_index++; + info->work_read_index %= WORK_MAX_NUM; + } } static int imx_rpmsg_pcm_probe(struct platform_device *pdev) -- 2.43.0