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 09457343D8A for ; Fri, 31 Jul 2026 03:10:04 +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=1785467406; cv=none; b=FpD8mZX34QY8ucbSXdFASY/vzVsoFu2pPUWo4uxUAxOsLSN2h4nI02U91W765T7FliCoORz4P1fG+/57vvLPXPyHwUGyYyS5LdIrtmd+9X6uR0uCfrF0jogXpGtmOIL9cxSUnNp6+b3+fFlJGywPin/V/WmnwDZqd3Cjyp/kk3M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467406; c=relaxed/simple; bh=GEVBslxyQTjWkaD769j6sBltZvw/8KgoyK2Jx23lHrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZPrUnBHZ4Hqe/XGwdHdrxJbZFrG4pEgFskOkNMkrtEC7xf0y6KzT3oTjktefuwNrP9nzAhhpcEF8M2jvWGeMAoXTMQJb8WhGUpztMMIux031eNEHVHWBbwOYLf+BZ7BYO7uDzIYPp+MQloL6H+bKzzpLlPlSIqTvrqgRulYOgUc= 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=sM4iE/Up; 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="sM4iE/Up" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cea3004256so5637155ad.0 for ; Thu, 30 Jul 2026 20:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785467404; x=1786072204; 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=LJuHQA4AENaPcuIoY4pYQA3muOxiEnEKnbdN4NwUjpY=; b=sM4iE/UpA94cEu/JjcVFFLeHx/zmNzoTyaeL7f/doZag8G5MwgsGoFM+KyecfU7cYI MFygHl/gDnyLh1+F58L1hQqoMdC3e9kvrVcaq1TBPKhSDRddr1+W9fiDrySXVWElCSVU qGPLPVbNVenReKAVCjGArMOb4Y1cGxNia/Evwmkc7nd5mud/IpJyCyv8GOcX2d27xkup uVseoWFb3H0CqiUSxP9pk0+ia3gvXUd6TGpJ3sxofcRe6yoz7/G4SidVYDrNgOvEw1Hd nwDWUto9mDSK4ZNYh1+jzcNCzBIxjmFOIpyBWtdGGhPxd5FRDSDhmtisxNY9x54BGpxP P2vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785467404; x=1786072204; 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=LJuHQA4AENaPcuIoY4pYQA3muOxiEnEKnbdN4NwUjpY=; b=Lp+gU+Vz0YmtJaeTq8kAPjUfMeXL0Q+mvPVox4BcHaD/yAfABUxjMDgAE0me1Djxl7 83VnFawEObXZC/nu53EuKXmB0lABlKXwdL3b1cBbI+JTlWIfqR4moT4JUy2mvmjSREL/ ptNynA/cjOKtIDDGYAOqbwcQy25Q2HqRf8MU+MyDFxLGBYcSpKlL6kh38VJ31lqChtD6 j2hJhAEIeukZH/7DVoeN2CgaSTmaFrYlkhTm6MMg7K//z5KPfZeXxrjQ27hnpnxUhBz8 X68py/qekHF/bG0eXE49e8Y3CXcu+ISpcY1JNOKbHZyQmopefr/9Pz8owy24yhSukETr 7Njw== X-Forwarded-Encrypted: i=1; AHgh+RpfbRe2FmBR3aYm55JQTd2FaFXBG3SCWCIxvgFTgTyESP9exJNgYHXmImM98TfVBVVxuzm30yHgMWEgBc4=@vger.kernel.org X-Gm-Message-State: AOJu0YxmTDM6G2KElQhx6Aj9hgElPoKxMm6BFa6OMO4N4/Tsiz7cgrFB sr7mwVpPb5SnFiLzwcOd+z9rpjIA2KcfsM+lix7I/oJiaNpRmcylCVl8 X-Gm-Gg: AR+sD12cUCADu9vzeGYau7hnk1WA/PcCfbL6fHVo8Cl+2dPutOnlrxNfWAHJ77EOJmI lFSF3N3LGm32Pb5M7R5Z9W6F6UdRWzNtOE7FnlEtwV/6xLPpHaaSuDZXNkUPtemwdI/a8vl+uDL pReT2W1pfo05dHJTQByrPAQt0hgpMjKRuvw2RjjafLE/4Qbyn/2U6yYPdRH2XaiKV6ryMyaYAEe nIqD1qYuFGnhBMZivBBpiCztpiS85BojOu04mJNneCKrhJrHZcyPV9MxZ3BeGDpaFJ06lMTehol zJJ22AmkP8233bNyJUyYSB9MGYppJ6qsIuL0s0rhM4Y18UF7/aVeJisZNu8ermnUG6pQK0Y6pR0 Q1e0AsBm65eClOzZjWAmudjtX/Czx3DwgkpoyZw4simt1r7CfJvEU4zQN97oMLo36EtL5jHOM2Q YIR5lV+eJCiBPvuGayPMMl+Q21zkyNwpCBxjPfqEEPTLH92qR2x3xgiZx5P1usObEGU1kK7/Lsj FAV6eZq+HLhyoxWfGUuJMr86/6Ushq5Ycc40YZ9X8xs+wN+03Jsi8p88xdLiLQr4uhp4acAJkx+ mUxQ X-Received: by 2002:a17:902:e5ca:b0:2cf:b6b5:9cce with SMTP id d9443c01a7336-2d046ec87d3mr4546725ad.46.1785467404334; Thu, 30 Jul 2026 20:10:04 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d047ae9f31sm737595ad.60.2026.07.30.20.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 20:10:04 -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 02/26] ASoC: codecs: sta350: Use guard() for mutex locks Date: Fri, 31 Jul 2026 10:06:24 +0700 Message-ID: <20260731030648.8706-3-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/sta350.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/sta350.c b/sound/soc/codecs/sta350.c index 99c7f7ac807b..2ba35076732b 100644 --- a/sound/soc/codecs/sta350.c +++ b/sound/soc/codecs/sta350.c @@ -16,6 +16,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ":%s:%d: " fmt, __func__, __LINE__ +#include #include #include #include @@ -306,9 +307,9 @@ static int sta350_coefficient_get(struct snd_kcontrol *kcontrol, int numcoef = kcontrol->private_value >> 16; int index = kcontrol->private_value & 0xffff; unsigned int cfud, val; - int i, ret = 0; + int i; - mutex_lock(&sta350->coeff_lock); + guard(mutex)(&sta350->coeff_lock); /* preserve reserved bits in STA350_CFUD */ regmap_read(sta350->regmap, STA350_CFUD, &cfud); @@ -320,24 +321,19 @@ static int sta350_coefficient_get(struct snd_kcontrol *kcontrol, regmap_write(sta350->regmap, STA350_CFUD, cfud); regmap_write(sta350->regmap, STA350_CFADDR2, index); - if (numcoef == 1) { + if (numcoef == 1) regmap_write(sta350->regmap, STA350_CFUD, cfud | 0x04); - } else if (numcoef == 5) { + else if (numcoef == 5) regmap_write(sta350->regmap, STA350_CFUD, cfud | 0x08); - } else { - ret = -EINVAL; - goto exit_unlock; - } + else + return -EINVAL; for (i = 0; i < 3 * numcoef; i++) { regmap_read(sta350->regmap, STA350_B1CF1 + i, &val); ucontrol->value.bytes.data[i] = val; } -exit_unlock: - mutex_unlock(&sta350->coeff_lock); - - return ret; + return 0; } static int sta350_coefficient_put(struct snd_kcontrol *kcontrol, -- 2.43.0