From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 6257B388E51 for ; Tue, 30 Jun 2026 06:35:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801333; cv=none; b=EPGNnDjt3Bh6506EbU+FoJDWDf8NnKIq16dVXKkRN7xbNb8u7dEkguRyXJoeITNh2DkEX180ITEVbpGqfeyd9lrAB0NuoiyeSL+SiL+XcJV8439QwaIvcn563DCMt1oV/7QJUVcSWF8I2/CU9xLfdf4rSvhsB7siyHOCYvlx4mU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801333; c=relaxed/simple; bh=vGG3xbNRD9aTcWhmHrqO23PJ1N/lJS4R0ZsiliefWlE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y4ze6rBG4Foh0f4YdXHWfkC4kgpJ171pL00husWAGl4f44tjLoCVl6AGDSkYVoB3ZRKqY59pODLnLlcJhUPLw7iqeb8ar0I3WVnCwsW6O0DdLnKbM4t9BHzDO+3bY1+Q+oqnWLZJdsgWw36hAUx3QpJd4WzDNN8Q4/yafZhFg8M= 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=iikW7/XF; arc=none smtp.client-ip=209.85.210.180 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="iikW7/XF" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-84236f9b638so1780949b3a.2 for ; Mon, 29 Jun 2026 23:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801330; x=1783406130; 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; bh=RozeYceB4iwycNfbGDK46tH90J5JBru51kfxpqOiyNk=; b=iikW7/XFxMIYt2zCfY1OKO1XlDleR5pTxxM21X07QOl+ZdDlfS6BXSg2guTIYNIXAw vE7GvrjRwKPyoGBUigc/itaSuDgOubzczDdsw/q8czzxTFbSBG2FkJb0J/XoLD0y+gYL V/unBJJctmC3eL9xiV4k5QBMRvdqsOuT/G7afHnlj/4L4d+If8vvHQ+uRB7tXo4ouxVf US6NqYj78nKeNnHweZ09MwwnBgP6VzB5SBB2kJU3XPVWLUSso0nu5Yyt7NZEM4wA3Kzp NvbukxgTcBFShxwHLY0fip6Wo4dYyqMg7geyBhdhLn0lBzRh604NpRNSfqTrk2WTyWLH hYMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801330; x=1783406130; 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; bh=RozeYceB4iwycNfbGDK46tH90J5JBru51kfxpqOiyNk=; b=Q/yBn1QCWGN/3bO/vs2MJ78SvEO0sUdDg6AcIWUsSHz9oXSwrbDp5iHGYC85OtrJ/o RjC5ZJwMhgfgXOj1i98yivwn4zShzOljSL9QA8Oj2u9n9MkmRAI25VS+4hjk9uwLkxIf T1OBfNZmSgNU456dkY3MZ6GDJSvA5DI5B8sMwz+U/F3jz4l+VJ4qcUflOwWKhcIyNILP x3PcAQcn09IM9blJy+4vd8kTAudDtvZ6pF21E7ZGoi111rpj+5z3XtlWF09tKn1k1g6+ I6a8pUg0x38iav0YUqFLHrDDo/RQdstm3b6Ub5nYyYZYhJpd6wAZhxZK6A2IO+a+tdor kiPg== X-Forwarded-Encrypted: i=1; AHgh+RolcxMr47Grqxu1hPugwPmS3Cfnwq4DpCRcn6+rKGoJvgEwLis2UYKDgRtfj76Vbxu+WRK7MLA80cSjH1b8@vger.kernel.org X-Gm-Message-State: AOJu0YzB6kDHyv/aL47Pq1hI3pi+QAcLVT/z/IbRPeLK2YhCQV0kXcW4 b3HCNcu1Y17sFOMkJygT8yf40nZ31boACa9WJ2DJ/fHEQ82QIPbI1fh+/MDSxA== X-Gm-Gg: AfdE7cl3kPbEHSNyqbW0JWNyDhO57yXZHND+rNly4fUvRODBT2AdotiDPBo9T+2sTnr wKvJmq5cLvd3P/BKxPh+1s7pRV9q23dJwj66UynZdkI1TnHqikD/4d+l3EgRTjLs9IDxJUVRyuY uSKsy8K3JhgTOTC61RrNp60apCndtV4A7SIFsaiPr8Jlfb4bIUP1RtTUwWZ4kdm1tZqFO47oxjg G82Cz2efEd2GvuOkPmr4KGsES6G9PhPiVJS6M7jRnEy35O1gEtOCegNjJCNHy3AAQiGiZLu2HmT 3FKaC9QnQNznXeweb5AHZV1V1p00h0nPiaYlhuEVm9cIwQq2yQGh80A92yBaMKoOHJC5SAovCCh qLo5vijjY/cpWoqgoZbIQlM9n6ceb2OUcxdUDE4031VKZ6IRD2cfSYxeNuzUTMrjD0r2NoE4LNT nSdbRPe4izsTTmJU27qCj5K5iRNUgZ9sp5zpH7xh+li8uQP5w= X-Received: by 2002:a05:6a00:3d04:b0:845:cf73:c1d8 with SMTP id d2e1a72fcca58-8479f1004f4mr1954813b3a.14.1782801329607; Mon, 29 Jun 2026 23:35:29 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:35:29 -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 03/27] ASoC: codecs: es8316: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:25 +0700 Message-ID: <20260630063449.503996-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-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/es8316.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c index 6a428387e496..e83dab0b7083 100644 --- a/sound/soc/codecs/es8316.c +++ b/sound/soc/codecs/es8316.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -621,15 +622,15 @@ static irqreturn_t es8316_irq(int irq, void *data) struct snd_soc_component *comp = es8316->component; unsigned int flags; - mutex_lock(&es8316->lock); + guard(mutex)(&es8316->lock); regmap_read(es8316->regmap, ES8316_GPIO_FLAG, &flags); if (flags == 0x00) - goto out; /* Powered-down / reset */ + return IRQ_HANDLED; /* Powered-down / reset */ /* Catch spurious IRQ before set_jack is called */ if (!es8316->jack) - goto out; + return IRQ_HANDLED; if (es8316->jd_inverted) flags ^= ES8316_GPIO_FLAG_HP_NOT_INSERTED; @@ -682,8 +683,6 @@ static irqreturn_t es8316_irq(int irq, void *data) } } -out: - mutex_unlock(&es8316->lock); return IRQ_HANDLED; } @@ -700,18 +699,16 @@ static void es8316_enable_jack_detect(struct snd_soc_component *component, es8316->jd_inverted = device_property_read_bool(component->dev, "everest,jack-detect-inverted"); - mutex_lock(&es8316->lock); + scoped_guard(mutex, &es8316->lock) { + es8316->jack = jack; - es8316->jack = jack; - - if (es8316->jack->status & SND_JACK_MICROPHONE) - es8316_enable_micbias_for_mic_gnd_short_detect(component); - - snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE, - ES8316_GPIO_ENABLE_INTERRUPT, - ES8316_GPIO_ENABLE_INTERRUPT); + if (es8316->jack->status & SND_JACK_MICROPHONE) + es8316_enable_micbias_for_mic_gnd_short_detect(component); - mutex_unlock(&es8316->lock); + snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE, + ES8316_GPIO_ENABLE_INTERRUPT, + ES8316_GPIO_ENABLE_INTERRUPT); + } /* Enable irq and sync initial jack state */ enable_irq(es8316->irq); @@ -727,7 +724,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component) disable_irq(es8316->irq); - mutex_lock(&es8316->lock); + guard(mutex)(&es8316->lock); snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE, ES8316_GPIO_ENABLE_INTERRUPT, 0); @@ -738,8 +735,6 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component) } es8316->jack = NULL; - - mutex_unlock(&es8316->lock); } static int es8316_set_jack(struct snd_soc_component *component, -- 2.43.0