From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 929A032E696 for ; Fri, 31 Jul 2026 03:10:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467430; cv=none; b=tQcs9wt1IYuWJGy5jp5D3SUhPOQ7KrQBGWWFdkhKpk9w0NAG8pPGMY7TzwRFOdoRiB58r6yfooEJGhpcNqk3KIe0YKDRHo5FZDBEA3pK78o7r8QeqmLkkq9FXzXecO3IKxxjPv/g17iDVRqcX7Zzk3No0dRQG5p+WLQ8GVtkFyc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467430; c=relaxed/simple; bh=CR/lpIz867Ge5SfVg0BgnctkBifwpEVSwmWaNcKvrvs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G4yY+f3tPR316ftujtvqa4WWoiBJnT9TTwR0ELpDl4pimFDUgBX3Rh52R46oG5W8tarLf7HrLyE1EOpzK029mWQ8pF/+WW9LbBu4W54X1wVEqrR+9sbGE37WzALYmWcwQOVHv0PJwmo7210gWmoarrqOiowdlUIRxknekF8SWuM= 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=JkMRRr+H; arc=none smtp.client-ip=209.85.214.174 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="JkMRRr+H" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2caced6038eso3857985ad.0 for ; Thu, 30 Jul 2026 20:10:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785467429; x=1786072229; 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:content-type; bh=tK2T+D6HuV5arLji/rG4gtI0GorQ1z1dx7hf11H1P5k=; b=JkMRRr+HkOHhtlHm2G6Y9zXsRrCuan8og8GGeAe3DcSkpyAGxlVoPcvCEU1yTG9ON6 ex7UoUDAtuw9LNgf8qt19qNl3HKo8TG5RLtj2IpbwkDanSWaiTZrdHnExPRXb+9z3aoj BZTItvA6pgza134/IJIHYl5k6q8UOSpNXwGPzzIgTkkWBa1QYSV8kdsHA5Ku6944iFpy wzl6onn5QAfSBAJVzvOmUPBZ1wkOTtHE7g9w4I1BxXjfiFHJWljdcnBz63E+U2KrSynl w00vxeJ9A/3ocAn9iIpULw0E8KuuxNMDX/T08N8HpXyD4v5liqtyI7z1iceNnwrODQyK P89w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785467429; x=1786072229; 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:content-type; bh=tK2T+D6HuV5arLji/rG4gtI0GorQ1z1dx7hf11H1P5k=; b=OVC5CH5b7r05Jkvu7C9D+3Vob07pqOv1WV3FW0lqwIePS5UnKqlFJT1joTEP3Q4b8R isyaNLTjDzz+TtMKcdsIjaRy5pgYbeePULuoicCjImp/U8KYl0S93bvlyIu72kdJEAn9 nHU86pH0KLEQKu3crhbCECpPPo7i5/aSY0GCcSP1JZuj+xEWZp2O0I++JkgdIKGd1vtI CD0CXNTPDqjtgSTCVCmsdq9AOm8Cvxj2yUTbXDjANLaPyiYP+vWzXtczorSavBXlwebK 4RcFSuEgS8OtJiiiqj844FLvmt/orIDx3SkVnqJsEncl2NQoGqVSYs30q0/wVw9b6Cqa 2H7A== X-Forwarded-Encrypted: i=1; AHgh+Ro1XXOK0aZ6f527FIUfF3T47P1J7Kow30pkW/RVQCzV+myIXzXSciIeeeh8QmMIH79ge6+trr15z35TFYc=@vger.kernel.org X-Gm-Message-State: AOJu0YzvOYofQBRR4gC/QRpat0PLZgb9VlGjCUIo28m40Ld9S0Zt096B rs4XAbwxhb+hOINHn2xTO2g2HEf03VW9ZktdAFJT4smNuEt/vaSwGHFt X-Gm-Gg: AR+sD10afzQ+BpUIqG8S/2gs/S243IMZoBagE8h6HtIMCo/zBkeCwaHFl2bp5f9H4Sr BNuGFfZXTeGgvdWPPZAlh2fqhum5YYn8pvzy+SvXl0ZGX9QI7yzAOfNsplbya7ZF1hxNGqPnVuQ 27akWdJsIYbm9HO7z1n4b8J7BC29BqtJwe9tQrNwoBwF7dFKuA6BR6BJU2yEYwi9LY9Rn/N8YeS R8VP2Yzxm9hpxfMOfjUmt8QIP5+4dDhgPgrBhPNAOZe/K6/WEueojqhoRwX4Jsn9TkexfccTUjZ TvYoZjIW5EMer4WtbD1SnGabR36IWwzQdNmocr2piJudeIwJhsk983mX1VQ+G//6ngRctVwbQXI jqxDII0TbKW0svbz5OjPrS/9ecG8WJUZDkEqm791VpKfUAV40WT042lDg38tdaAOupVcEUwUeXi 7gLGmgEeOz/w+n6a/19k3tgUxho5cB5WVFqT4NlXzWY98+nMkDY/Ai01tDVgsfVa60L7s0aZq6z hBuvir/QQreg671k95uG+qR47yd8GfLuB8tv5sSyPfgBWlYHLob2Xz9ep7rwAERGzke8RnqdMFJ VkfL X-Received: by 2002:a17:903:4b03:b0:2cf:7ea3:7cf1 with SMTP id d9443c01a7336-2d047d1e554mr2198265ad.5.1785467428981; Thu, 30 Jul 2026 20:10:28 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d047ae9f31sm737595ad.60.2026.07.30.20.10.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 20:10:28 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , nuno.sa@analog.com, Shenghao Ding , Kevin Lu , Cezary Rojewski , Richard Fitzgerald Cc: Baojun Xu , Sen Wang , Steven Eckhoff , Srinivas Kandagatla , Kuninori Morimoto , Charles Keepax , Linus Walleij , u.kleine-koenig@baylibre.com, Thorsten Blum , Kees Cook , Chen Ni , Bartosz Golaszewski , Shengjiu Wang , Sebastian Krzyszkowiak , Pengpeng Hou , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, bui duc phuc Subject: [PATCH v3 05/26] ASoC: codecs: tas2783: Use guard() for mutex locks Date: Fri, 31 Jul 2026 10:06:27 +0700 Message-ID: <20260731030648.8706-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260731030648.8706-1-phucduc.bui@gmail.com> References: <20260731030648.8706-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/tas2783-sdw.c | 60 ++++++++++++++++------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/sound/soc/codecs/tas2783-sdw.c b/sound/soc/codecs/tas2783-sdw.c index db58c50e8a83..8ebed797acb5 100644 --- a/sound/soc/codecs/tas2783-sdw.c +++ b/sound/soc/codecs/tas2783-sdw.c @@ -12,6 +12,7 @@ // Author: Baojun Xu // Author: Kevin Lu +#include #include #include #include @@ -693,12 +694,12 @@ static s32 tas2783_update_calibdata(struct tas2783_prv *tas_dev) return 0; } - mutex_lock(&tas_dev->calib_lock); - ret = tas2783_validate_calibdata(tas_dev, tas_dev->cali_data.data, - tas_dev->cali_data.read_sz); - if (!ret) - tas2783_set_calib_params_to_device(tas_dev, tmp_val); - mutex_unlock(&tas_dev->calib_lock); + scoped_guard(mutex, &tas_dev->calib_lock) { + ret = tas2783_validate_calibdata(tas_dev, tas_dev->cali_data.data, + tas_dev->cali_data.read_sz); + if (!ret) + tas2783_set_calib_params_to_device(tas_dev, tmp_val); + } return ret; } @@ -927,22 +928,23 @@ static s32 tas_sdw_hw_params(struct snd_pcm_substream *substream, dev_err(tas_dev->dev, "clear latch failed, err=%d", ret); - mutex_lock(&tas_dev->pde_lock); - /* - * Sometimes, there is error returned during power on. - * So added retry logic to ensure power on so that - * port prepare succeeds - */ - do { - ret = regmap_write(tas_dev->regmap, - SDW_SDCA_CTL(1, TAS2783_SDCA_ENT_PDE23, - TAS2783_SDCA_CTL_REQ_POW_STATE, 0), - TAS2783_SDCA_POW_STATE_ON); - if (!ret) - break; - usleep_range(2000, 2200); - } while (retry--); - mutex_unlock(&tas_dev->pde_lock); + scoped_guard(mutex, &tas_dev->pde_lock) { + /* + * Sometimes, there is error returned during power on. + * So added retry logic to ensure power on so that + * port prepare succeeds + */ + do { + ret = regmap_write(tas_dev->regmap, + SDW_SDCA_CTL(1, TAS2783_SDCA_ENT_PDE23, + TAS2783_SDCA_CTL_REQ_POW_STATE, 0), + TAS2783_SDCA_POW_STATE_ON); + if (!ret) + break; + usleep_range(2000, 2200); + } while (retry--); + } + if (ret) return ret; @@ -966,7 +968,6 @@ static s32 tas_sdw_hw_params(struct snd_pcm_substream *substream, static s32 tas_sdw_pcm_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - s32 ret; struct snd_soc_component *component = dai->component; struct tas2783_prv *tas_dev = snd_soc_component_get_drvdata(component); @@ -975,14 +976,11 @@ static s32 tas_sdw_pcm_hw_free(struct snd_pcm_substream *substream, sdw_stream_remove_slave(tas_dev->sdw_peripheral, sdw_stream); - mutex_lock(&tas_dev->pde_lock); - ret = regmap_write(tas_dev->regmap, - SDW_SDCA_CTL(1, TAS2783_SDCA_ENT_PDE23, - TAS2783_SDCA_CTL_REQ_POW_STATE, 0), - TAS2783_SDCA_POW_STATE_OFF); - mutex_unlock(&tas_dev->pde_lock); - - return ret; + guard(mutex)(&tas_dev->pde_lock); + return regmap_write(tas_dev->regmap, + SDW_SDCA_CTL(1, TAS2783_SDCA_ENT_PDE23, + TAS2783_SDCA_CTL_REQ_POW_STATE, 0), + TAS2783_SDCA_POW_STATE_OFF); } static const struct snd_soc_dai_ops tas_dai_ops = { -- 2.43.0