From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 DE4223C5DB6 for ; Tue, 30 Jun 2026 06:37:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801465; cv=none; b=Xh3jxnn/qN0TkUSNJuEwtr+CZpD0WKiXvHYiguDt3RWu4UmXa9ZJg158GdKhwJQbNeeEDaaq/PB9jS0MnOEUZbB6Z0R+oNONnMcKDuaaP07Ja6cSGF0isePXqK6j4Je6KCK3YnLaO1GlY9UVRNICvgcvWBZQnFVmIxCYV8JgKHY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801465; c=relaxed/simple; bh=EIQsPIFGpWU19M+kDklYuiSZWizQeKdwr7QPFIQrZeg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NPfS4VTzwlR+rmcoZ2r+eHONO2v1bvW3UL94P7yWmrG4H3THeTCSXnJ67tCeWBEPxrW3O2VbtMtK/No04+stFmsVTjEMYR531O0t22/xnE8x9ZmoQzk37sIuorhFlJQTCuaciCg4VmypEHVcFWYyE8Wf4qhU+KxKGvnfQPjHvk0= 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=XWPm06LI; arc=none smtp.client-ip=209.85.210.176 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="XWPm06LI" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-845b6d9bf39so165798b3a.1 for ; Mon, 29 Jun 2026 23:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801456; x=1783406256; darn=vger.kernel.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=ro7dNqCD2kLl5dqOgIDoE4tVtLHIEVBSdhnRDBcC1Vc=; b=XWPm06LIh3EltvrXMwcXsDWmCpOSFikMYgX/83qOjOvCw6LBK7NSGdpE+zQaLQxTyT gosq3W9ze6rbT3OHy9H3Zq25ZQ6NHwtH7ZFtQXTmHk/w6XYxReXA8W84sDfoU/CZekWZ Z8P8Hfaqdt1v0UHJYb9AieGE3Qth3ckJvT0mP9mP7Sjs/rDJ2Soqu4Bl8wjBHXQTKvpO ob4Gl1DMhiy6aitLFEM94f3Z6TOBfp2FKAJ4R12Uww1LdMyvByRZ8mrxAspSAuCDwBW9 tMfRQrBCx4lb2VZQ+M3jM2SLSY6YFlliCQyB/GgvnPVh+boGalZIc4Rx5Io0Dx1ntvev HlaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801456; x=1783406256; 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=ro7dNqCD2kLl5dqOgIDoE4tVtLHIEVBSdhnRDBcC1Vc=; b=QlYuNz+XydPl/BA9bbhEDna8F1vYrQK6nyev2U7FlwHlNNAUKrnndW58Mg57ikuoYk g2Gtklkz4UwLa0rSecsAvkVEcWFu7avqISttUrGXCsW6Z9cHrPVSMWJHT+DNqzQb8NuD uMMBka6JViUdN4sLiAF54rNf7KzTbi2MpQD4ykRiGW/H4ggWBA8invsP6kSXr1bA2hIN N/UkIaKNsOEFEgNcLQ8Zg/qh3HV5FHjrnWlbtSE+BJQGG64DqSOcutm1q5piZGMD8ElD vKxY/VFEnehK0Mg+MH3VLsGaVRR87xJcSuVElpDvjEnB3gyI/t88tQhkpMYophaA3lrx NStQ== X-Forwarded-Encrypted: i=1; AHgh+Rql06/+MboS0L36okkjr+BNB6Tfbt1ZSG93wCJiWIN7qALPz4G1oCooStH02itRIkeM3Kj/G1/NkRj9gPI=@vger.kernel.org X-Gm-Message-State: AOJu0YziY1RwBRlYI0e2S/zx8OfJytIPtIsbo3WfAw1CsDitt2UCG+oQ 7EaP77PE+MIS4taB3J3CQcQYmXjF0+FqCQJx8f/ltbqm398EYT82xA5N X-Gm-Gg: AfdE7cla1gHuMCO/dHARJIMIe4ETO5VqL7CFRB2uE14Xr4//j6YRiZ77ysFPMyE0Nrk /LkRyVzvrkTWBV3vngOhoxGYPH4lAMkMfznRTmMgogxWtY8iDNInn61Eu/XQKU88gDfdQxkuKjF Rx2GnhRzVkc4GV/bRrA4ix7IDzyMyWptSxs2SaZSsdapIMb2JFwFxp065c+CrnbFC2RVLUc86J3 jnC6gloqMma+lLBXP7MnkZiWdZ4bAAR3SZHzFbnAXmsVO0Grkc7Htoxbav2SvAVGEyKxTivi6in T7g2jyoVNHcBbQE5vmbhpMm7KkZEpUZ46MSH4F0wM/Q5AkUo0j/p6yjUztbDYcefievYwwfed40 Mv9SbmTGMgQwD/CMdCpOwicQc3B4Qu6cAV++6bHKd/ySPECr4VxuirCzQHCapkaJmug7ABi87P4 dZq81vsSjeG2DK0VZxeo/xrnORvc5iyzXU6aSdTcOHlpEW518= X-Received: by 2002:a05:6a00:3d04:b0:837:f111:b70 with SMTP id d2e1a72fcca58-847a81835d1mr428150b3a.4.1782801456574; Mon, 29 Jun 2026 23:37:36 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:37:36 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH 17/27] ASoC: codecs: rt5514-spi: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:39 +0700 Message-ID: <20260630063449.503996-18-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org 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 | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 199507d12841..91290bfe8daa 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -6,6 +6,7 @@ * Author: Oder Chiou */ +#include #include #include #include @@ -79,17 +80,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 +112,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 +147,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 +214,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 +223,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 +232,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