From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.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 79B9D3EDAB3 for ; Fri, 12 Jun 2026 13:27:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781270852; cv=none; b=W8sD5a2Eq+Aa18kZsONfAxWyxHYswTfcDxWDhuZolVHeQ1mK/jri/yBMLrKK6ONzOWLbKAeoIiucfTlRgySeI2h1x2xFyLsbyetyx4/eHaNasaAFntcovefkS7AsxA7vDnhcWpG0lOaHaVoIrlzs0JbHdoNa9A4O5yipvLAGNCc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781270852; c=relaxed/simple; bh=8cF3HebG5op+ITs1XJRWMhmy9A1xc6/hcMM+4iQxiIA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o+gsYMKzQ4qm8m95K1nWQNV0Yf2bZ3430nlk7VIyTP84plpd4LopjuRIo9h2E7psAaJMan+6Q8bLYL1l4GjBahPSgsp0WgvoHQoi3p6B8BRUZCjWYyCq5OrLwBP+xyIwjvSkOm30OxqyKFfm21zPtrUjxf1A1dBHTfUg8KvlFUY= 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=OxaC3eq4; arc=none smtp.client-ip=74.125.82.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="OxaC3eq4" Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-304d8362a58so767725eec.1 for ; Fri, 12 Jun 2026 06:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781270851; x=1781875651; 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=wpnchv9pa/fMvI5rIt88B4RF1cetJyaCH3vcYXn44rs=; b=OxaC3eq4jFqe2R2WwkkRrMXOZ92GxI7ZU4bNswKNdKenESCaA8txT6JKAIbOZVZPeo +mCx1M+mMFHEENhvwulhyu8G3c+EbuTmkp5JR+25uUL3jvOLjCWAZoLpj3R+9yl9anWK usp0S8q1gBQUN6bFcRtoZVr0R5ruM1rujUVSifzw3Z0mhPnxF6bGOS8KOe1Zn48rruF4 LuX+4RVAr9zFwGgYVHgvKK/iKtIPBEX1R66uD2FOt37AN+LIvY603ITlOOkQw5DmYHuh vlZXAEppDJSi1Vffbk/L0L1qky4THgXPd27KOBAZvt9K9Akbfu6YkYXFqYiE1lToPDlP ZouQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781270851; x=1781875651; 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=wpnchv9pa/fMvI5rIt88B4RF1cetJyaCH3vcYXn44rs=; b=bkfFeu6jzpRbbRs0WkYfx2qBvN03Hcbg39OX2kOtIdsxhS8vEhvxk4cwOlsB8Oc/oX azRexovlGVwvcNkrZoqsBp3X9wrAwTNSQjPjbdgs+yFEpL5t0yKU/DmgusZuzD21k1Kb Pl1adQnHJxjQ0TlFJrevwPn9EExPiY65sr7QSanp3tQ26Ct6uZqAFuAJkgmLQ+rUYfDp IwHV4iYREJIUkA1OFPcpZHCaEbwmc/YYygiicA5Rmm5Cx2lBM0jy5QM6RufXx49cDofb lP2XMQ1qCf/v2EAx+1Pka3mh70c/+YxHmCwTqmpY2NbtKs3jIdHCTzmNAA7OgICXNCpC fxkw== X-Forwarded-Encrypted: i=1; AFNElJ8i5Ga8wNAw8j9DzY6lDFpUub9OMifVC7NaS33++Ed33dTjHgHZFFCsBhhcDWVI+0A2cIukHDnJn5ecoRw=@vger.kernel.org X-Gm-Message-State: AOJu0Yyr5rR5jUhgA6UHNKxG2dk09dR7eWzEke9XR03znMBh9iDp9OAB p5Zc58nEHI1Xy64pM/MIpSIeaiJic/L3L5ITKOWhIJM17vG6I+1iMoA3 X-Gm-Gg: Acq92OEgI6dizSYNqpm1bIxA1my7zzbIkgNOXmZsSEaxik2/pfo6T9AKWJ01Vn5mvMr S8pm1TrhQHZSibYCoU9h8AF8lpkD5IUyXbwp4lfmOv7eGXA97TZdEWsMcGZoDQA4J3R7oBVAm9Z SMsl8aBRhDbcqcCtq5HkkGI7nwgEhT5HrXxoM1Sutl14fbxWFzfv+U+IK6lBNlV5dH/qWmVMJwR ryTtyaWbHAEq6p8HlvTCTT8pQJove9562kspMgrVO8Bn2zVA/xMiA7fmV/JMVwQ/sgUPuCbexmY 62vjOVytTsW0Aa8mffecldU+SwAAEqgJAgoFAqme/4pmJyVI8Umo21zUAY79FmS/crDizHncig0 jkjrJVnTgIQMZdUk32QNPXPD5kuAqIzL0/xPuXX8fNSvW4K2YD0VD3EwFvTK2jxLBxn5oVY8/OC mIOuryfP8hjYbYCpmnbj32M6cSqjeKdTJzN+EdoPiOStnwlHvDsFFSX+n8vQ== X-Received: by 2002:a05:7301:9f09:b0:304:70d0:4f03 with SMTP id 5a478bee46e88-30820c2d782mr1373677eec.6.1781270850611; Fri, 12 Jun 2026 06:27:30 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e91f8b5sm3302343eec.19.2026.06.12.06.27.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 06:27:30 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Xiubo Li , Frank Li , Fabio Estevam , Nicolin Chen , Sascha Hauer , Pengutronix Kernel Team , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, bui duc phuc Subject: [PATCH 06/11] ASoC: fsl_ssi: Use guard() for mutex locks Date: Fri, 12 Jun 2026 20:26:34 +0700 Message-ID: <20260612132639.78086-7-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260612132639.78086-1-phucduc.bui@gmail.com> References: <20260612132639.78086-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/fsl/fsl_ssi.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index b2e1da1781ae..dc022976c982 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1218,13 +1218,13 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg, if (reg > 0x7f) return; - mutex_lock(&fsl_ac97_data->ac97_reg_lock); + guard(mutex)(&fsl_ac97_data->ac97_reg_lock); ret = clk_prepare_enable(fsl_ac97_data->clk); if (ret) { pr_err("ac97 write clk_prepare_enable failed: %d\n", ret); - goto ret_unlock; + return; } lreg = reg << 12; @@ -1238,9 +1238,6 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg, udelay(100); clk_disable_unprepare(fsl_ac97_data->clk); - -ret_unlock: - mutex_unlock(&fsl_ac97_data->ac97_reg_lock); } static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97, @@ -1252,12 +1249,12 @@ static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97, unsigned int lreg; int ret; - mutex_lock(&fsl_ac97_data->ac97_reg_lock); + guard(mutex)(&fsl_ac97_data->ac97_reg_lock); ret = clk_prepare_enable(fsl_ac97_data->clk); if (ret) { pr_err("ac97 read clk_prepare_enable failed: %d\n", ret); - goto ret_unlock; + return val; } lreg = (reg & 0x7f) << 12; @@ -1272,8 +1269,6 @@ static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97, clk_disable_unprepare(fsl_ac97_data->clk); -ret_unlock: - mutex_unlock(&fsl_ac97_data->ac97_reg_lock); return val; } -- 2.43.0