From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f178.google.com (mail-dy1-f178.google.com [74.125.82.178]) (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 BD68D3EE1EC for ; Fri, 12 Jun 2026 13:27:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781270858; cv=none; b=Zxe/fjssOatHvFZXhJUaLMRNfN/GB9M8wY6BJtGWFj2U/7sUnJT6hWuzvqUks1kmcBbtmGQqkEFRi4AEFkvGd2C09ZKUHWIR3LEjB26QhVzro2yOuds7vDj2MaWyWFQoZHBiXfcoB+KcHhB+R7zDbDlLEJrC3Topii0HdnmYwR4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781270858; c=relaxed/simple; bh=uVOODI0dcvu4VrcEd7Pee45Ik1Uu9/KkXXqPodrFKkE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kUn2wKz8ovM9zKbPKi3hs9nzC3GIyD2SurZxye4kzYczLoyXg3/sh4Lq27GZhN1oU4XFXQ8C+dnYXqt2oBnPidXWDzHhUCb4rsVJi1Hq8E/fgMjSYnZr+tx6JyFBIJHGT1dlUHISkV5EL41qEsFfNXWYrj4Bvbnfjg7jMN3rfOY= 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=SLCIRlfE; arc=none smtp.client-ip=74.125.82.178 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="SLCIRlfE" Received: by mail-dy1-f178.google.com with SMTP id 5a478bee46e88-30759632453so2066493eec.1 for ; Fri, 12 Jun 2026 06:27:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781270856; x=1781875656; 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=MVq+Lu3avSLljn1bjHDwqj7k0Y9nxoC/mnINOIpcocM=; b=SLCIRlfE00FvX9XD4ovtJt0fHbLdLOXmjmRwfwRu9YZaofTfic/LdSqyS12tjD5yG6 0VQWIYyILGWlf8vRivXLUuKEfJJsfYXsz9SY4kmvWL28++gHciIU2te+SlLF4ZcrU0F1 blCdaHaGZ9ho7i6bcVxfq5hkiBn4RDze4YuR97KgSe2ilMyJuhNgVvnEU5bK4Ybwp8r9 PO1AZ3HItrCq+W5GSHvEGNBUBggfzA5vGcKM8Ugs/AjidRAssOzbrH5LTncihiZu+Dum rwZyzv9PcdqbY1goZJ+qXfLuuRPCwvgEDMVwMrSc/LdfWMiVYYRns5q0bukwj2R8ep8K 4P/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781270856; x=1781875656; 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=MVq+Lu3avSLljn1bjHDwqj7k0Y9nxoC/mnINOIpcocM=; b=Fw2Yb79VjOxBOG1WqCGPwVO3v+FZQyAmh324yDvF87I8mg+jAIqQS2uEZTJb17zw/2 TlBS/mguTqcDap8wi+qV0CmmIPA0dzqnZz0LEErxGIOGuCVhibRY+++6dBjWHsAf5pDx o/+34mDKNxMptNDftNVs27oK3b2QParLYWWQEGN5flFbFvbPOulGkTL6apyULgisD6Ln C9f4CsAWLXY12bW027/k8ekJjOCZhsqOWZxgpY2QixrMjFMmPV5f6YrPlhpnh5aTx448 N4Pmp90xeuhu9tRh8oS0rMFX93IlhctFeMVNzyMWakWv4zR6ZBmh8y9KN3WGhIgwmEE+ ndUw== X-Forwarded-Encrypted: i=1; AFNElJ94OJCwm9WucMMImN/6fFmIiv3fnMBkezbIGOQV8h2wZn0gjQ3MOdDnmaPcvmVKVNC2RKS+HRMS7csWHQ==@vger.kernel.org X-Gm-Message-State: AOJu0YxwyzmrtjLq1tzK9O62+GtJKENDxfPtemxfmNY4GnYR0132lslM C673iMZpZQvzE0zBWj/TPfM3MNYVKXmtcqaopJH2NAZXltDm8+CqiSj7 X-Gm-Gg: Acq92OFT34cfwrcuPeejbBR+Eo/TCMOVXbL1pahYDqHIxhsPteQxI/bPXn/ohg4kjsK JhJQK64NvDw2yC2n1/b6HMobUWVuc0S1eyNjckVKZkW7bfeDGznvNg0y29zizYtderkvIu+9zOJ utOpDifiQedSHTWiY2bCIUUBoP/CZ8GFD8yI0YX7cDmxhUTHyn/8qT7CylveOTGVI0hOi+JBDag T7nJltvtHVpPVF7a/s7b/lPmk4vW6/jNRpd0yX3Ba+3mbWblHkFFiabcs6Qd+7+oHdg1rJBuzGr zXpX5dERc3pch/cjeQAeKLcLBOMezeLvZA17J8ctC5viMj/XyzH59lkhFh0bghnc6YIbZvwL3oX CzdJxUTeGPgOUlfquiJdW5xdM5kZAhQ0KvAsi8xcDGZlBC34mCa72C1iHIiOH7dlOJTyI0aPHeb ASa8V8+JCLMuc6+CPACsrdC05IYVEL/RWy0OQvvqvFJHs8fwJ6/nve8LVCyg== X-Received: by 2002:a05:7300:f082:b0:2ed:7e1:975 with SMTP id 5a478bee46e88-3081ff64a8emr1866575eec.1.1781270855805; Fri, 12 Jun 2026 06:27:35 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 06:27:35 -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 07/11] ASoC: fsl_xcvr: Use guard() for spin locks Date: Fri, 12 Jun 2026 20:26:35 +0700 Message-ID: <20260612132639.78086-8-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-sound@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 spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/fsl/fsl_xcvr.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c index 6677d3bf36ec..41d100500534 100644 --- a/sound/soc/fsl/fsl_xcvr.c +++ b/sound/soc/fsl/fsl_xcvr.c @@ -797,10 +797,9 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, { struct fsl_xcvr *xcvr = snd_soc_dai_get_drvdata(dai); bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; - unsigned long lock_flags; int ret = 0; - spin_lock_irqsave(&xcvr->lock, lock_flags); + guard(spinlock_irqsave)(&xcvr->lock); switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -812,7 +811,7 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, FSL_XCVR_EXT_CTRL_DPTH_RESET(tx)); if (ret < 0) { dev_err(dai->dev, "Failed to set DPATH RESET: %d\n", ret); - goto release_lock; + return ret; } if (tx) { @@ -824,7 +823,7 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, FSL_XCVR_ISR_CMDC_TX_EN); if (ret < 0) { dev_err(dai->dev, "err updating isr %d\n", ret); - goto release_lock; + return ret; } fallthrough; case FSL_XCVR_MODE_SPDIF: @@ -833,7 +832,7 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, FSL_XCVR_TX_DPTH_CTRL_STRT_DATA_TX); if (ret < 0) { dev_err(dai->dev, "Failed to start DATA_TX: %d\n", ret); - goto release_lock; + return ret; } break; } @@ -844,14 +843,14 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, FSL_XCVR_EXT_CTRL_DMA_DIS(tx), 0); if (ret < 0) { dev_err(dai->dev, "Failed to enable DMA: %d\n", ret); - goto release_lock; + return ret; } ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_IER0, FSL_XCVR_IRQ_EARC_ALL, FSL_XCVR_IRQ_EARC_ALL); if (ret < 0) { dev_err(dai->dev, "Error while setting IER0: %d\n", ret); - goto release_lock; + return ret; } /* clear DPATH RESET */ @@ -860,7 +859,7 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, 0); if (ret < 0) { dev_err(dai->dev, "Failed to clear DPATH RESET: %d\n", ret); - goto release_lock; + return ret; } break; @@ -873,14 +872,14 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, FSL_XCVR_EXT_CTRL_DMA_DIS(tx)); if (ret < 0) { dev_err(dai->dev, "Failed to disable DMA: %d\n", ret); - goto release_lock; + return ret; } ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_IER0, FSL_XCVR_IRQ_EARC_ALL, 0); if (ret < 0) { dev_err(dai->dev, "Failed to clear IER0: %d\n", ret); - goto release_lock; + return ret; } if (tx) { @@ -891,7 +890,7 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, FSL_XCVR_TX_DPTH_CTRL_STRT_DATA_TX); if (ret < 0) { dev_err(dai->dev, "Failed to stop DATA_TX: %d\n", ret); - goto release_lock; + return ret; } if (xcvr->soc_data->spdif_only) break; @@ -905,7 +904,7 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, if (ret < 0) { dev_err(dai->dev, "Err updating ISR %d\n", ret); - goto release_lock; + return ret; } break; } @@ -916,8 +915,6 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, break; } -release_lock: - spin_unlock_irqrestore(&xcvr->lock, lock_flags); return ret; } @@ -1448,11 +1445,10 @@ static void reset_rx_work(struct work_struct *work) { struct fsl_xcvr *xcvr = container_of(work, struct fsl_xcvr, work_rst); struct device *dev = &xcvr->pdev->dev; - unsigned long lock_flags; u32 ext_ctrl; dev_dbg(dev, "reset rx path\n"); - spin_lock_irqsave(&xcvr->lock, lock_flags); + guard(spinlock_irqsave)(&xcvr->lock); regmap_read(xcvr->regmap, FSL_XCVR_EXT_CTRL, &ext_ctrl); if (!(ext_ctrl & FSL_XCVR_EXT_CTRL_DMA_RD_DIS)) { @@ -1469,7 +1465,6 @@ static void reset_rx_work(struct work_struct *work) FSL_XCVR_EXT_CTRL_RX_DPTH_RESET, 0); } - spin_unlock_irqrestore(&xcvr->lock, lock_flags); } static irqreturn_t irq0_isr(int irq, void *devid) -- 2.43.0