From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 E085D3909A2 for ; Thu, 23 Jul 2026 04:54:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782481; cv=none; b=c3h5UgTJ6Q3al5Ure4Wwz32fQ5thZSzB8cWreV40ep1jowahNXL4Fa24UpKavfFIG3GzMr4/F+55PgH+0zZ/KG9HtRjWhYvOIFjduSBEiYK4GDL6Z8GNNxk9DjMmwrXU37sgkRQWWkwHXkLMAxAJeB0gKxZV1OAlDp7o/Mli1HQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782481; c=relaxed/simple; bh=CR/lpIz867Ge5SfVg0BgnctkBifwpEVSwmWaNcKvrvs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S4RX6PzoR1iTxJIOg5DNHSoc5DRZ/yB60lLsuxaa5IMccoAiCEbgDFgOff2vKHZdoCSSiXwqttirjlGVNvSgfrid5s9uZxQz+fsNQt2uKc6Tm7H01Q85ySKZCSvpoP5Wk9y8zYM7cORDGulSHt8d/qSyOKqJ/Jh14BLsMtNWPBs= 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=Pw/3XqPF; arc=none smtp.client-ip=209.85.214.179 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="Pw/3XqPF" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso2552725ad.2 for ; Wed, 22 Jul 2026 21:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782463; x=1785387263; 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=Pw/3XqPFoTiFe4SFQBGEiZM3z8neaVT4CZQNKPK07TQpXdwZ8RuQ4+lbh2WLI8Jc1u +Qra2i3J3pBNWarngdIHP73tXTe8NGXp/M/WNerL4wG6ZimWvsCmchGooU/wl9zeMn/e l2A1VJeLhC/Wxbd35vXj31/IUaUv4jH27GmbBxcw7g1u1mn/PjP18CXvQi1Zx6i1cteh WIw0N8A0mwCdcDWjGPqyaXiryPlxK+hXBuPZ3hf03h1nRXIT/yB2jqloeJZllBOLgS/i DHE16RhuO+LasnS2FSjY9Df9bAfCGCRDqV8CT1KZW/1+5XwdwpJ5Vw70Ri7J8AfNG5hc pC/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782463; x=1785387263; 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=lT46ZdpS9uAhF7+0ntgF190ieWDTXK0FskAgC+7udOeHTG/wSuO1CiSD9m+YnA0wrT 37erd/gV+rUCsaBdiJmugPDCHBIDDtHlY2LbB0nQQwjgh7SEDoHr7BejumTlg5x2Qtyq e260nkqmoy1hv7D02jIaX/JyeSUbhdHsnZUld9MxNhCWET53kFcGSNojsUZ6g+7efvsq rwV1lfDKHIKMuBW2XNrGo3z22ww0ho6C9c33VfGZD7iphP9Y1nw1PUgtm9ysuGuD2kpt FywAjE+cg4gVCZZ30plNbUF6iJxcJKqeUsgF+4+V6PaylXso7aTA53Ifv/YPcvDfeWvj yr8Q== X-Forwarded-Encrypted: i=1; AHgh+Rod/5rX9gG7zPqDs31qCQiDb2vgIueO0coww/jjl7ROtX9Ea8xBZHL+anqYEnAVB/PcGEZWReFzqIussec=@vger.kernel.org X-Gm-Message-State: AOJu0YzuB0z1BkRpIHKN+XOwRQvmUSLvS68oyIzHAZbZaQRlCz10lS4k uNNMoLSW3RYVCxBSELUM0IRKjcl/lvTXrSMsC0fzhF4veI+7ibsltoAS X-Gm-Gg: AR+sD11nAO02Be0GVQGjFEaaHE8gqCKnyBeX7yz97B8v+xyA1QivVneydRdI1NBXdwA DZi+PC37q6XYKOahRCVn+c3AQmqqBdRZPCYSgb7qY9gwutd9xoeFzkPYtDeMSAen0bEFZZjzj5f 3xdBs7qssiPAGMLqzATP0odYMAj1pQQ713SO7vQysJlgHtoNMgFFZHS1NXpk8PuiyroeYUJiq1T ZoTD4fDXNUqVjq8nKTGxL7MH1ecVXJjUsx6RLFfR4P47AOKZ5dLUEQ2H1ahCpL9H/sMXBtp3PGj ncZkQkhkx+cSHNpnbEx0rpH8KQhci3K2U37hs7HHJQr8lkLxSIDOGN97DbkkyvxzTDlxN4dPo8u pejlKWrH28cosZnYKgJMD7EQ3T+koaqA23LscJc+SkzB7e8go/loju2Hu//fCUCj8skxq+4ACO2 rQ9VVoFbE+sKqIB6+rRV+7w41BO9G0JlOGkqPa X-Received: by 2002:a17:902:d491:b0:2c2:62ee:5a0d with SMTP id d9443c01a7336-2cfa6b77547mr21765715ad.14.1784782463491; Wed, 22 Jul 2026 21:54:23 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:23 -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 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 , Richard Fitzgerald , 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 05/26] ASoC: codecs: tas2783: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:06 +0700 Message-ID: <20260723045327.28260-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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