From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.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 0FB67381E8F for ; Thu, 23 Jul 2026 04:54:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782451; cv=none; b=IidBy3BcaoTNvq/iCEzQUeHzYggHagvotRf9DaPu7Y4gk1XzF2sou/hip+aMKNnCR+xO52LyTE9lggfyMsNBzSrgFFwFKUXOqk7DRcoLwM2mS8UqO8jJaf2Q3IdsAlmAJR+zGcE6SNKnQUDvS/jMc1NLAZ72NsqgmjNmICF5czA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782451; c=relaxed/simple; bh=GEVBslxyQTjWkaD769j6sBltZvw/8KgoyK2Jx23lHrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nKihYHGusI4Z8kd2/NYawgCiElcFxGijnABaV7UaxAM8IiSnpoIFw3M80Pjk8974R3vA2a6HGc8/syNMpga+asv6pV/vm1gANQusEVdxTQbhKKUKm0kuZ0w1biixjWhkjRZcsxX630byBevNeuvBHdX9Am2r7U9Bo0wQZZzJrcQ= 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=lCbCWYTj; arc=none smtp.client-ip=209.85.214.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="lCbCWYTj" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2cea3004256so2882805ad.0 for ; Wed, 22 Jul 2026 21:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782441; x=1785387241; 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=lCbCWYTjXe2z4WlE6x40viO06+Re+eCZzkxPFIPfjc6LbHrBVOTDDSxRjEeFPNK9fN TUOyqu+0VFr6PkBmqLBW8p4bYBERAMLeUrVzbGaa3RKFdOY3rbouKlMZ2ezDOuY5ePls GaxH44+aPp3IBk5edJ4hgvg7Py+S4Ai7RGDrtv0R6/NPGgI1cBFmQ+6mJNPTw6L3pB81 TkzVege4loOfAAPe58GpNghAyYCL4Evw3/mwUFXipW8q1ElkNmXYHiZfbyz+BC5wsEXU Kx4aapkBud2I2gPAUUPtNgLsBBA3e52SL/bIP4HyNn98LhSMYxRPgRmKoAopDmw0vK72 UOoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782441; x=1785387241; 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=Kfh8QXmiDkdUOcEWyw+lfdpCVxe6rjb4u0VSvJHv/mMc/sQhwERePjgvAJBjs8V1CD Z+6afEEzR8qNz8yndRPTQO4BRn9eEPRfKx92v5k258x/ry7Iz00C2w9UQqwYC5ReOQ7N 7uZL3kOLu6WuE3SWul0jVo+hNNlq4Wu+LvTM1/HTf/538h6KuzbUOhSGZwUwR85W/W2D JONzAlko1wshLeYr74voDQkNUqUwKltPwywK7A+QFhjm30e2q8VkfhGQNT+GAwFFeGB/ 0ZT9ErRk1b6qRdsKDwjuO9G0aqS3nQ4uUAYxpZTJpplqfN4MZ4f1pJbh+ITLGpahr6U3 Z5gQ== X-Forwarded-Encrypted: i=1; AHgh+RqpxuIe9O4goLA63yjb3gIi0ElUcKn/UUiOLsFyaFjmDfJWMhfyPvEqgujvyCLcyyzbzgMalqInY2kt3yjc@vger.kernel.org X-Gm-Message-State: AOJu0Yw14bOsaO3s//XuA3Eoj1H49UUOHgo3PWfZ1Gj5Q0Mshn9DTlKk reVFXz4cM6WXroXuAv2/OtoYbVqyD4QLJ6oAwj6GecWazYYQkayCT2iY X-Gm-Gg: AR+sD10hIVxiNpCsbbFY9+FgMK1tsOLf2VzXj4Ii34SAAfJolCNH0stgjX0ZWATDhyg YaNEsIMg51oGLTN4kDfxOzBYO70CcATKkN37EZzFfqhl4sW4n1BbDoBgrnphh2pwiTnYZq+U7f/ HRkMQeHrnypQNKpbs+86of9mYO0w7sjnzH6jlbPwj5FZx4URklgteDmgmtSAiqdbz+GJ/BofLDg cWD3YAFcXmVIFyHZySEeTBZjqFMcVPNiXWs5Lyy8mA+xuxjnGcCzYBApCrgygeDqCP7ssnHgRxd gumNjDlTcT1H8ZdLFuJOKfU1Azyiy+lR9Upr8GYaOsu2ijwvPbAkRL0NBtneT98n74k1apGoGL4 JMy3ecumgHDHvplzoe1wqjv7ZGNhZ5oSZuAvESAF2+FHEtJiXl+NoH8nUgO5jYrjvz3WlAcvuQa eFChOoTRlCMJ76MlPU/o28EhniSvFQ7s6Po1bP X-Received: by 2002:a17:903:1a67:b0:2c9:97a7:71af with SMTP id d9443c01a7336-2cfa6f79cd1mr19036105ad.42.1784782440729; Wed, 22 Jul 2026 21:54:00 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.53.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:00 -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 02/26] ASoC: codecs: sta350: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:03 +0700 Message-ID: <20260723045327.28260-3-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-arm-msm@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