[PATCH v2 07/11] ASoC: fsl_xcvr: Use guard() for spin locks

[Frank Li]

On Mon, Jun 15, 2026 at 04:38:20PM +0700, phucduc.bui at gmail.com wrote:
> From: bui duc phuc <phucduc.bui at gmail.com>
>
> Clean up the code using guard() for spin locks.
> Merely code refactoring, and no behavior change.
>
> Signed-off-by: bui duc phuc <phucduc.bui at gmail.com>
> ---

Reviewed-by: Frank Li <Frank.Li at nxp.com>

>  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
>
>