From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 0A7D9480345 for ; Tue, 21 Jul 2026 10:27:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629622; cv=none; b=PTdoOqEz6MAxYKl81YOp/Lhj5jS9G42RD4S8DnQWvJUekehiXSbQNAcOWMzIp8wIV3O8dVnDywLSiqXuCoHQEkA0D6e9XAb0XjthlZa5r+dCo8s20E4OSrPRYmPDhsnxloT7ZTdAbXVQvG5nVkaJjDn7CegSuNqWJFUHNJUwFs4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629622; c=relaxed/simple; bh=Zdr8hLxY9++tkgvmrSBQ/nmGUnRqi1UBxCC3v/LYELg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W4BkpRhHpytn+fZO1CbrEsZjXhQYRu9w0tA3bdxFbVipuLz9ebcvv2KAYNab+j6fd9pXncxU5WkB3hNxCFRCGN1EYpvRAacnRieNs3PwuUH030zjRXUU4o07RpIBm5R+oVDDZYOZGVhRKhxrFra1Am2VOHCjSqKLCYsDjSh20oI= 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=N7R5xvVu; arc=none smtp.client-ip=209.85.214.177 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="N7R5xvVu" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2cf452def93so21562805ad.1 for ; Tue, 21 Jul 2026 03:27:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784629620; x=1785234420; 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=hzI+xvr6p88cYg+8jImYn6yoqZyRq117x6xc2+j9GZs=; b=N7R5xvVunErfhJR0ADvhnNPNEWcXlY2EoRLsk76MmixsliZWyGmI0zCU+FvWEW61Ty MRdB/MegMoYKT7g2qRtZNF5uAK72fy7XzAQlsndEUwmA24WtUnMOZ469MJqD0QSAJWF1 OfRBqFWCoBwVeg6S1SYDJ8baz19YIDbCXRcGElEhZJFefe2e1WpjU/5BpV/WPcADF9PQ NRxzvLyInEs7kyCfpsSXqSkBPzcVG+pkmjiLRA/MIanKQO/+8ypWzvD4NZxM+CkmknN+ /1MobZwbKiGg2NFdKvAXuESylphOOtbry+uXMzF5CtALWmSKbEP0KxcyXa33P3QnJzET RAUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784629620; x=1785234420; 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=hzI+xvr6p88cYg+8jImYn6yoqZyRq117x6xc2+j9GZs=; b=OvcpbV5BI0VRj3pgmgyYWWW3rABnudgm1kMUBhPduLpe6jCcUrTuCMOersvlSEsNxC j1jEhPOE+EngkRA/3XQba1aRWfq+zL8ysntZHGVmDvU1UltZdfUVmSiOmBE5uW5aipvo D1FNT8d6DBnaUlrwmXgM8FuUkLHfjLwATq1EFdP4hdrKuJPcUd8iYPHOEKM4Ie+0RYjF NcPXMOzTRY49IW//HfDDgUbV0uHx1JExY3QamIrNtBGPA4Tv8TqetQ9nNtf6MRJklBpW G3NLbJu8hVSG1FIGHwT2n9gDhFYun+WpyG5Hw1zN8Vb5yBwQCW161VbQlL5obCJ48sUT xjWw== X-Forwarded-Encrypted: i=1; AHgh+RrGiZGCA9M8rDn06HxHhbiygFbOanlx8JUjhFG0siS7Tnc2PFYY+lUdK2CicAMjX6dpCfJYBlEWHRlB3k4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4gv5Ekect1OSfyjqtwV3Ijvlp2zGhfujaHYMQ9a02LyayADx3 DZ39iX+STVLi+NL5zEVIPOwVlT/vvxcTFXuP+ij+RiaXIoGwjyIDhDAD X-Gm-Gg: AR+sD12HXrz9zh7j/UGR4D6Xw/4cRl19JN4dZJemEesTYa54u4TVulebJOJg+Lp6y5u mWKDtKB1YL0mcP9rBvswK9gpEYtgBTkNfjL5mVN2NMEVAUcO6ScJq3nJBeUC2McbOV7Hlpt2mdH 2l77X+127TvmD0yV6YbOAP8vIIfjLQZ4kXf93ccg7P196Jd09N841zf3LfOt4u/VkAvbmR+Ry/P nYCH3pifnIzl6WdzRzqdAjTGeEpS/veDXZ+oBVhcGJQ8U15GfAzmMColKR6gxaWM7d8LpgC6trH jaioXO6iYg6K2R8qNZMm7x6T6nA/SdDYX+NR7eN62bkR5o2SgdlPLN3v/sGndYrTxvr5r9T8e6V +Zy6mAgpdyG7kTyRM5GNEgJ4Q6J0R0RGi44jknA0dRYSHszEAgBxS6s8yrIAGZNPO7rWpbIH67X tkgtnAu8wNKYSomZ8YylHFcAV+BY9MyR0Jwby0 X-Received: by 2002:a17:902:fc43:b0:2cf:41ba:96c2 with SMTP id d9443c01a7336-2cf41bab3cdmr143685015ad.12.1784629620455; Tue, 21 Jul 2026 03:27:00 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf3448dac2sm73581365ad.3.2026.07.21.03.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 03:27:00 -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 v4 05/29] ASoC: codecs: es9356: Use guard() for mutex locks Date: Tue, 21 Jul 2026 17:25:36 +0700 Message-ID: <20260721102600.523199-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260721102600.523199-1-phucduc.bui@gmail.com> References: <20260721102600.523199-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/es9356.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/es9356.c b/sound/soc/codecs/es9356.c index f574b3d6cb3c..a9863900bf70 100644 --- a/sound/soc/codecs/es9356.c +++ b/sound/soc/codecs/es9356.c @@ -6,6 +6,7 @@ // // +#include #include #include #include @@ -500,16 +501,19 @@ static int es9356_power_state(struct snd_soc_dai *dai, unsigned char ps, unsigne } /* power state changes are not independent across functions */ - mutex_lock(&es9356->pde_lock); - ret = es9356_pde_transition_delay(es9356, func, pde_entity, ps?ps0:ps3); - if (ret) { - regmap_write(es9356->regmap, - SDW_SDCA_CTL(func, pde_entity, ES9356_SDCA_CTL_REQ_POWER_STATE, 0), ps?ps3:ps0); - es9356_pde_transition_delay(es9356, func, pde_entity, ps?ps3:ps0); - } else - dev_dbg(component->dev, "%s PDE is already %d\n", __func__, ps?ps0:ps3); - - mutex_unlock(&es9356->pde_lock); + scoped_guard(mutex, &es9356->pde_lock) { + ret = es9356_pde_transition_delay(es9356, func, pde_entity, ps ? ps0 : ps3); + if (ret) { + regmap_write(es9356->regmap, + SDW_SDCA_CTL(func, pde_entity, + ES9356_SDCA_CTL_REQ_POWER_STATE, 0), + ps ? ps3 : ps0); + es9356_pde_transition_delay(es9356, func, pde_entity, ps ? ps3 : ps0); + } else { + dev_dbg(component->dev, "%s PDE is already %d\n", __func__, + ps ? ps0 : ps3); + } + } if (rate) regmap_write(es9356->regmap, @@ -1091,9 +1095,8 @@ static int es9356_sdca_dev_system_suspend(struct device *dev) { struct es9356_sdw_priv *es9356 = dev_get_drvdata(dev); - mutex_lock(&es9356->disable_irq_lock); - es9356->disable_irq = true; - mutex_unlock(&es9356->disable_irq_lock); + scoped_guard(mutex, &es9356->disable_irq_lock) + es9356->disable_irq = true; return es9356_sdca_dev_suspend(dev); } -- 2.43.0