From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f169.google.com (mail-dy1-f169.google.com [74.125.82.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E034E43D4FF for ; Wed, 17 Jun 2026 10:39:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692770; cv=none; b=AhlO3PGDT1xo8Y2S8HlJArr6cyqNO/QWi+8MUuVtoE/HzSSSfmHoRoYTF5WCrhQ1s/bmZBayu7w5lItQct3HRFAuhPVA5aW+MTQbjAwnX8sTsHMbIVBUYs48RgoqRxIG7qNoCsgBg7Tu/oHQC0MxbSqCZQNUL1hXUIs5w38Aqso= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692770; c=relaxed/simple; bh=glqReXfZPCSQ9DjYZSYbXgYtCkut9TkNRV+nVhsubfM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EMIHx+inMFzN0eQc7rQl12sobo1eSYYn/x2gDeV5S28If1n5APe10PxAiGraR+X/1023GoEZ6x5P9MchOZLHs93D81XG+6BV1/KlaSKuvKTkuuoMDfYraV0DjZPoGIxMiigS2bhmYmgd420COuHIRr0g8ph8ki92W5wUN7//fXY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bMm1MrMV; arc=none smtp.client-ip=74.125.82.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bMm1MrMV" Received: by mail-dy1-f169.google.com with SMTP id 5a478bee46e88-30b6dad2382so6296098eec.0 for ; Wed, 17 Jun 2026 03:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692768; x=1782297568; darn=lists.linux.dev; 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=4V8d0Yg4cyesbpB3rX5XFizQgFDCgrflJrinbH7M1Rc=; b=bMm1MrMV8J/5WZ1jlZzxVPRXpf9VOPU5kBMdXLkn6+vqG+UKXgA6AOopRTq/MBRd63 EZ6oWcoLZaQO/s0Je0p8f3vzKdTIc6dyuKh+aDlWlnlAPHz0q6KILOMEwEYkfTHIyKKr cb5FJN5qm6jVlUvssQ6yyTWC1rvar4m6qHhVOMJ55pq2hHQpClbXEJh8xj71/Ue7ZeID bxRdWXoMyWXG6Mh83gNZfy3sIp9Nf6dv7SQHEYz/g1AQz0c7fBEvaxqUHMN7g13Kt1Bf 0LeqNSbUxJRgkbVZM5zqcuJOEWqOHjeupatnrO6sxD82BBe0o8tWn/vr29PApvMGWnnm WGqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692768; x=1782297568; 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=4V8d0Yg4cyesbpB3rX5XFizQgFDCgrflJrinbH7M1Rc=; b=AvFKvlZZNDFWPQLAfQ3WXrdhfl7NMtZUJYEjdoKUwPQzZGwqyi+uNpyV2df9sq+XbR C6fVbJvzhQdtNtb8UtVHizFo4EmuNRMnAnucY2UEDp6PESqY42dNfSEpR5mBr/J+6Fq4 DIatRC1lXO2hKLEMbk4cda3J8KmvVBaFJeZ/Q4CH8Ry/jHkkIbxWyOi5AKua2UeVzf2B DXmgiXuDh/r6Upb5yhi6PP59JrLerAvPhK/fdHAIrviOsZjEgRLH5rbofyA6NS/bOQqH v8FQowZmcCO+AAHixm3AZfmNgaHbEYzw3ePqslgYGDzMojx7WlxuBIPeOuOkXAGS+6gU VHgQ== X-Forwarded-Encrypted: i=1; AFNElJ8nrD18DZbGMDHIPwmWnlO8HtNTc1W7oJlo/NW+/Wh2FiWeJCMTH+280ObkrFUIkrR4Lb1jkA==@lists.linux.dev X-Gm-Message-State: AOJu0YzvsFwcJ4DLxLhRRoUCQC8N6Zuhv3kwge9LYzb5CeJ/SoX1zgha UH6E8s5JMsALXwJhtv68p09e7zyiVL33MAE7XJpNfF+Ot6zDGVKl0geB X-Gm-Gg: AfdE7cmCfTqpYqWvcN/Bg2stse+rZ3SykWkIVdd4S0qZcMVtVzeiDVEqCHCSDkIo+8J r/u/Zwnaoi/oxeshHKDwSKhFgtxeyUJTRrIjJa55GR8n3oog7mAoVCvly4P8LqieR8RX8SfUkXA kvc3GzjuZqnVI0hYZ9ByqozY46XXKydC77DpTkkapnI6bkDBOx09ZWUbh7+4BSV9oi0kX/BuiVQ 8fjGBEZxC+CQxlfJp3lpE2BHK7j637z05GJOJpymdd2ZsQcQwFElaPbYTA8W9Lob2enk2wy2GPI 6MtJDqCwvGTtbLFAxGFQfPvKD4LfCMd+zzDcjOpXfM8G8BTVr88CJu0Xvz6pFQEuENn0Y6LIgvK rLIxheE8jgpeAVwoy0X+naI/8Oa95uFjAZHKvtUUCTZRY9WxDaGMlwxr3FcOJu679mMElLKGos1 6uSgvo/MO61PNodrcII+Yq8qS3DLo+87gpZe5fQCJdxNoWiDk= X-Received: by 2002:a05:7300:2d20:b0:304:d835:274 with SMTP id 5a478bee46e88-30bcae227f9mr1625563eec.24.1781692768114; Wed, 17 Jun 2026 03:39:28 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:39:27 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Cheng-Yi Chiang , Tzung-Bi Shih , Guenter Roeck , Benson Leung , David Rhodes , Richard Fitzgerald , povik+lin@cutebit.org, Charles Keepax , Support Opensource , Nick Li , Herve Codina , Srinivas Kandagatla , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Lars-Peter Clausen , nuno.sa@analog.com, Steven Eckhoff , patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bui duc phuc Subject: [PATCH 41/78] ASoC: codecs: rt5514-spi: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:58 +0700 Message-ID: <20260617103235.449609-42-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260617103235.449609-1-phucduc.bui@gmail.com> References: <20260617103235.449609-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: asahi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc Clean up the code using guard() for mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/rt5514-spi.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 199507d12841..be4f5f7da22e 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -79,17 +79,17 @@ static void rt5514_spi_copy_work(struct work_struct *work) unsigned int cur_wp, remain_data; u8 buf[8]; - mutex_lock(&rt5514_dsp->dma_lock); + guard(mutex)(&rt5514_dsp->dma_lock); if (!rt5514_dsp->substream) { dev_err(rt5514_dsp->dev, "No pcm substream\n"); - goto done; + return; } runtime = rt5514_dsp->substream->runtime; period_bytes = snd_pcm_lib_period_bytes(rt5514_dsp->substream); if (!period_bytes) { schedule_delayed_work(&rt5514_dsp->copy_work, 5); - goto done; + return; } if (rt5514_dsp->buf_size % period_bytes) @@ -111,7 +111,7 @@ static void rt5514_spi_copy_work(struct work_struct *work) if (remain_data < period_bytes) { schedule_delayed_work(&rt5514_dsp->copy_work, 5); - goto done; + return; } } @@ -146,9 +146,6 @@ static void rt5514_spi_copy_work(struct work_struct *work) snd_pcm_period_elapsed(rt5514_dsp->substream); schedule_delayed_work(&rt5514_dsp->copy_work, 5); - -done: - mutex_unlock(&rt5514_dsp->dma_lock); } static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp) @@ -216,7 +213,7 @@ static int rt5514_spi_hw_params(struct snd_soc_component *component, snd_soc_component_get_drvdata(component); u8 buf[8]; - mutex_lock(&rt5514_dsp->dma_lock); + guard(mutex)(&rt5514_dsp->dma_lock); rt5514_dsp->substream = substream; rt5514_dsp->dma_offset = 0; @@ -225,8 +222,6 @@ static int rt5514_spi_hw_params(struct snd_soc_component *component, if (buf[0] & RT5514_IRQ_STATUS_BIT) rt5514_schedule_copy(rt5514_dsp); - mutex_unlock(&rt5514_dsp->dma_lock); - return 0; } @@ -236,9 +231,8 @@ static int rt5514_spi_hw_free(struct snd_soc_component *component, struct rt5514_dsp *rt5514_dsp = snd_soc_component_get_drvdata(component); - mutex_lock(&rt5514_dsp->dma_lock); - rt5514_dsp->substream = NULL; - mutex_unlock(&rt5514_dsp->dma_lock); + scoped_guard(mutex, &rt5514_dsp->dma_lock) + rt5514_dsp->substream = NULL; cancel_delayed_work_sync(&rt5514_dsp->copy_work); -- 2.43.0