From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 8AEF23DA7F2 for ; Mon, 15 Jun 2026 09:40:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781516437; cv=none; b=MDfxKXAnvexdxkAvkuO2j6L0l9Oi0KFTZTBOdV692+GraRTTfVKONk7UBx0rs4EeQmdrIJU/+CYKv+ABL05lngE7XhHKn3LUjZdrH01T8TIgrXfpfxXfLxIOjNYFHLsNIMsXbDdXsdDWUm/A8cDBFmO5iNP1nT9VUo2zjN9arik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781516437; c=relaxed/simple; bh=8cF3HebG5op+ITs1XJRWMhmy9A1xc6/hcMM+4iQxiIA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mxLxS6SMkTKlwtTxUhDGRoIdy3w7o+dyNxTNGTPr/KIJK5WJU8TsjMZmAwquMypNdMAWP/U0CZaXhnn8wGp3PjAynw2hzzz2hypc+j+Rw+8GwK0+gXObWc0bqG9LyuzXx9hDccrvpdmxfXEEmpM+LMY4TJybN5E6Aj1qOoOAQ7M= 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=GphXlP/A; arc=none smtp.client-ip=209.85.216.42 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="GphXlP/A" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-36bba9a1089so1799186a91.3 for ; Mon, 15 Jun 2026 02:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781516436; x=1782121236; 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=GphXlP/AbEZJvPUA+fGkJ7BJrk9ygOVTYaM+6pOK/Hl+L8eafcHjJmCOFn4hY9RLMQ zRUh9V1OGGGFtfrbNFNax3DQI5uZgJHpRVrB7EznMl68Ye9dTL22sTZKsCX97myvzHKX zYVPbssMu/c4sMIKzvHLp//4UefTMwUM4unuS9nxHQGW2S46+UFNUbS0knfzn4S/ew0D spKBcq7fdkXZZjaDIe93cm323yKVfiVIHJxcCEhbWaaRy4ICwcFJRAmck2CroA9U3OW5 mLpARvc+3smzo+vSRr4S2Ijn2aWS3oPiHbbN44hyLNWBj6WbnOXmROX+7MXLz9d9Thsc YwJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781516436; x=1782121236; 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=L9DKRd7bjKq7ZNZjTPrrPKcNhlV0IjZVOl1QImYS7pu4l3k7BsYmtyWAMfOV5ElhJD ipcw2xKv8PWglEeo4QisRC4U5OeGANP+P56PDnVAHvVohBp9VX5Pj+49wSeHTWVKuvWB u5SPvurTh83RQDIXE1ue7j9ZdtJNuhCEhneqevaQQPpIkRtaT9TG8A69W9Qlhm0GyYWa exasfGcp9mhX99pr5rpyBrz7URl5je2t60FrHMYuAc9CbM94egwoy5uZgqMIb7Dz4KXm oXz4H/0dwcUq5x4e93LdO80x7aqiO3iy10+ErZ9TMoB2G949ZPwUkI3n/hVgduKGT9My uGZw== X-Forwarded-Encrypted: i=1; AFNElJ/dQa3OTFc7uKqUUWAz474+RRcAbpZ7wnwgAlXub6MxyVild2pIQvkZHIsQLXmS5AER4dyBR6C7Cx/qp5Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8ftcIEvHToFEjGsxLDNRZNGvg2+r5y93ArIxS6gekn2Y/hSsC rr/29+xFUqSmCC1fnuS0Fm0zxDYUKLtQTx/9mJToTGIkqaGokRSz7a0s X-Gm-Gg: Acq92OGoHf4hoyfRTys6/fJnnMGmZEZK4M9lxbgo9GzYOWpSAVeL8vNQvJm9/BHDNY9 ltcv8FQjNgdiBNXed9K1EQPxr/EPlh89yjH3Wa74sIM/xAHELhCxVD/AddhTTSMd43F+iREosI5 OzZhIk/vq+wjF4F6BDB+gx/Vj9T3C+jQayLIghOmlHTajKcwt+Gt5dNc8hB9gENR5FozjNJ9+bp dDNda8VtbMJeQstd9+BO0vdqHxv3NmE13numanHYs3ADZ3nJqswuaui/m+fErW9T6eTn+CqE4FB IaeffU+xn67ZCRgytAyuobkxjSRneDpxCqjj4+rQ7vNXfXNzDcjFAgsHz3kKePWZFP/m5BJ6HCD vrQ8NJ1RGU1p3/SdvnroyRuVr5JzJ/i8261Z0W6fcXjfMVS4lfThfPFaK/9Dtvvp6LI/5KbCoF3 1JFtSZ/iIFfAoGPZ/glKbErYWNGvSivnvwLaOsB6ZwivS2gOE9FejGt9R6rg== X-Received: by 2002:a17:90b:5623:b0:373:c536:6fc2 with SMTP id 98e67ed59e1d1-37c2bd5a9b0mr10221623a91.22.1781516435860; Mon, 15 Jun 2026 02:40:35 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37a1eba8e9asm9936290a91.2.2026.06.15.02.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 02:40:34 -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 v2 06/11] ASoC: fsl_ssi: Use guard() for mutex locks Date: Mon, 15 Jun 2026 16:38:19 +0700 Message-ID: <20260615093824.115751-7-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260615093824.115751-1-phucduc.bui@gmail.com> References: <20260615093824.115751-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