From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f43.google.com (mail-dl1-f43.google.com [74.125.82.43]) (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 EFD723EB104 for ; Fri, 12 Jun 2026 13:27:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781270879; cv=none; b=m3zB8jGfyi6hiu7kW+X9WMC2mQhtAdh9v4NR/WmSHavRzJfGaesdZxBzPhoaw/nW9JRANeNAtXVGPKGWYizrFts888CxC8skaJRrLH/LrivLvCOR9nZKfnO4VG1Hij2iAIyn/5RFaekOUnd+wNAnl7o/WW4fR9PfaoPJZKEQ2UY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781270879; c=relaxed/simple; bh=/Y4fs1/9QhCczmqk3YkGlZVkwGj2PaT0jGsJY5U02Hc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cnZEgcV8tXMkSGuLh175Gbq3iOcAHt//Da5uHXOrQR9lZdcIXsFp3wUqbnUC9Sw46w5Oi8gT6FBQHRxYW+xjB4906oyikp1MB1NZNOBr5TAX52ln7PSh1Abxxr5GDbwI2bIeq6xL+9BQzY9WZ/IOGm4IocwLNogsWgtS35rU/Os= 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=n6llgUX8; arc=none smtp.client-ip=74.125.82.43 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="n6llgUX8" Received: by mail-dl1-f43.google.com with SMTP id a92af1059eb24-13807d2f898so1086490c88.0 for ; Fri, 12 Jun 2026 06:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781270877; x=1781875677; 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=n5EcAgUJr/miZOm5euArTUYqCmQuAK60NFxSW5E+pw0=; b=n6llgUX8kbg/57ewLXqGaVgII8atm6Jkv3EAwnHpa30GE2EuQU8ATIqW3S0nUz+5IA j+ErwPpnQ3qIRk8GNUah/7uvwWSVa3YHWjMYg0SgZDNV7jKSxU5ILhWifxegGWBVvrxn GGkZGoMSgrPeMra5R4U+9PsN0r1Td5ngECNFxnG2yVlD53J5HFWeH4/UU++JVf5NyOT2 xbs8FrmR5SdUDlPcAOQS9rBZ/mT8MsvOWjbGr3pQF4w7xFIqyrF6n8gynsXb539xQt89 qyd1I/GTRGrixJ/UZTBpDA/E0b+JO08XxGPcAk5W+U7FMJntlsRUDU9SUzCG1giNgKF0 mIYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781270877; x=1781875677; 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=n5EcAgUJr/miZOm5euArTUYqCmQuAK60NFxSW5E+pw0=; b=IAO9ECIwUj4Nq8CoWfPA9rEIMNUemp2/8TL+6aabaoOBlfFp6z0yaEHaS5lXPkixFw r+JreFJRAVskVwXmQQ7ibqinzrsoEgqnB2Rg8tzZCyhhv4jsFRxzO9WpT+x9tkpBnRJG 45UqcVwCzCqgU+ysqmrzHagNIYQBWVL9l/7va/4DmGSDPalLCnywxB9dPAk4ehApslHf 246hUfY5ei6L/iYfVSZJDJ56w9t4me0G/N1Bcd4zjBfy3T48KiXwAJNse20Gp2SjRfRg 7OC6KaLfuVgCTCORYrM9GKyGKKu5SWf1iyw8TLCHzoRzooDb/bTLyA1yUCe5yDCeyNTu /IOw== X-Forwarded-Encrypted: i=1; AFNElJ/Jg29ACWSY1eybJtlSXVor+Hpzerb7trALDvhgOwQyJK8Bc2DPqCeJlRuHy7A3bGVmKnnmI0zb73GAbmA=@vger.kernel.org X-Gm-Message-State: AOJu0YxttGkr8VeicacLBlYDRrhqfCTdBXUTBohwqqR4x4AqSakWiPkh hIext1vXUawAwSxtGOr3cxttBQocazeBqrtUMzgdlEUJ++xymf2qHfzpmFFFWA== X-Gm-Gg: Acq92OFfxO2HfyS/4agZdv2KA/2zyrVkNwKPt+aekWFAT/ADMdDH+xdMAMTfJ15Zqao 05Cwm6mHcfL5+/On5y4kvDjOJUu/WJdsfejdzcSCLlzKj8NNxnt3WU5apacJNkztI3tbchJ+jms 0NPlPaBQs+Id1x9SEFqJkFIpPYpobx4pKbvxULlWzjgEm7MI98bNEI5us5VNesLsBv4KJthJ+d5 x7m1wx+J4rBHmWCCNldgv0N+fl5eFx2P+rvuVKjFNEvQVh67sWsFt44JQpdE1qnzN2wqD91DEDb kJ/HtdQ83maneRaCANRgpd5AmjGMC6mZlobvgEbJlUvKtFr7pbIdamEBmctvWzSTtWN7AX01GBG /i/scB2EQmG96mEJMnm+UB0qa47DfsFST1tWR+zQrGSXUH2jt6B7atbxRmiex2QgfrVfj/neYbv mhsoublhK8QTFLjKddm62l58pEuKedPY02Vg6BCnrJ6LsHrJvQeDpRiaVHfA== X-Received: by 2002:a05:7301:6083:b0:304:2eb0:2726 with SMTP id 5a478bee46e88-308200a883dmr1707604eec.25.1781270876974; Fri, 12 Jun 2026 06:27:56 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 06:27:56 -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 11/11] ASoC: fsl: mpc5200_psc_ac97: Use guard() for mutex locks Date: Fri, 12 Jun 2026 20:26:39 +0700 Message-ID: <20260612132639.78086-12-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/mpc5200_psc_ac97.c | 34 +++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index 8554fb690772..80666da923d0 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c @@ -31,14 +31,13 @@ static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) int status; unsigned int val; - mutex_lock(&psc_dma->mutex); + guard(mutex)(&psc_dma->mutex); /* Wait for command send status zero = ready */ status = spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & MPC52xx_PSC_SR_CMDSEND), 100, 0); if (status == 0) { pr_err("timeout on ac97 bus (rdy)\n"); - mutex_unlock(&psc_dma->mutex); return -ENODEV; } @@ -54,19 +53,16 @@ static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) if (status == 0) { pr_err("timeout on ac97 read (val) %x\n", in_be16(&psc_dma->psc_regs->sr_csr.status)); - mutex_unlock(&psc_dma->mutex); return -ENODEV; } /* Get the data */ val = in_be32(&psc_dma->psc_regs->ac97_data); if (((val >> 24) & 0x7f) != reg) { pr_err("reg echo error on ac97 read\n"); - mutex_unlock(&psc_dma->mutex); return -ENODEV; } val = (val >> 8) & 0xffff; - mutex_unlock(&psc_dma->mutex); return (unsigned short) val; } @@ -75,52 +71,46 @@ static void psc_ac97_write(struct snd_ac97 *ac97, { int status; - mutex_lock(&psc_dma->mutex); + guard(mutex)(&psc_dma->mutex); /* Wait for command status zero = ready */ status = spin_event_timeout(!(in_be16(&psc_dma->psc_regs->sr_csr.status) & MPC52xx_PSC_SR_CMDSEND), 100, 0); if (status == 0) { pr_err("timeout on ac97 bus (write)\n"); - goto out; + return; } /* Write data */ out_be32(&psc_dma->psc_regs->ac97_cmd, ((reg & 0x7f) << 24) | (val << 8)); - - out: - mutex_unlock(&psc_dma->mutex); } static void psc_ac97_warm_reset(struct snd_ac97 *ac97) { struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; - mutex_lock(&psc_dma->mutex); + guard(mutex)(&psc_dma->mutex); out_be32(®s->sicr, psc_dma->sicr | MPC52xx_PSC_SICR_AWR); udelay(3); out_be32(®s->sicr, psc_dma->sicr); - - mutex_unlock(&psc_dma->mutex); } static void psc_ac97_cold_reset(struct snd_ac97 *ac97) { struct mpc52xx_psc __iomem *regs = psc_dma->psc_regs; - mutex_lock(&psc_dma->mutex); - dev_dbg(psc_dma->dev, "cold reset\n"); + scoped_guard(mutex_lock, &psc_dma->mutex) { + dev_dbg(psc_dma->dev, "cold reset\n"); - mpc5200_psc_ac97_gpio_reset(psc_dma->id); + mpc5200_psc_ac97_gpio_reset(psc_dma->id); - /* Notify the PSC that a reset has occurred */ - out_be32(®s->sicr, psc_dma->sicr | MPC52xx_PSC_SICR_ACRB); + /* Notify the PSC that a reset has occurred */ + out_be32(®s->sicr, psc_dma->sicr | MPC52xx_PSC_SICR_ACRB); - /* Re-enable RX and TX */ - out_8(®s->command, MPC52xx_PSC_TX_ENABLE | MPC52xx_PSC_RX_ENABLE); - - mutex_unlock(&psc_dma->mutex); + /* Re-enable RX and TX */ + out_8(®s->command, MPC52xx_PSC_TX_ENABLE | MPC52xx_PSC_RX_ENABLE); + } usleep_range(1000, 2000); psc_ac97_warm_reset(ac97); -- 2.43.0