[v1] media: rzg2l-cru: Rework slot programming for V2H/G3E

[PATCH 03/14] media: rzg2l-cru: Modernize spin_lock usage with cleanup.h

Posted by Jacopo Mondi 5 days, 22 hours ago

From: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>

Use more modern constructs from cleanup.h to express the locking
sequences in the rzg2l driver.

Signed-off-by: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>
---
 .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 32 +++++++---------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
index 98b6afbc708d..2d7ac9f37291 100644
--- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
+++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
@@ -11,6 +11,7 @@
  * Copyright (C) 2008 Magnus Damm
  */
 
+#include <linux/cleanup.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/pm_runtime.h>
@@ -110,10 +111,10 @@ static void return_unused_buffers(struct rzg2l_cru_dev *cru,
 				  enum vb2_buffer_state state)
 {
 	struct rzg2l_cru_buffer *buf, *node;
-	unsigned long flags;
 	unsigned int i;
 
-	spin_lock_irqsave(&cru->qlock, flags);
+	guard(spinlock_irqsave)(&cru->qlock);
+
 	for (i = 0; i < cru->num_buf; i++) {
 		if (cru->queue_buf[i]) {
 			vb2_buffer_done(&cru->queue_buf[i]->vb2_buf,
@@ -126,7 +127,6 @@ static void return_unused_buffers(struct rzg2l_cru_dev *cru,
 		vb2_buffer_done(&buf->vb.vb2_buf, state);
 		list_del(&buf->list);
 	}
-	spin_unlock_irqrestore(&cru->qlock, flags);
 }
 
 static int rzg2l_cru_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
@@ -165,13 +165,9 @@ static void rzg2l_cru_buffer_queue(struct vb2_buffer *vb)
 {
 	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
 	struct rzg2l_cru_dev *cru = vb2_get_drv_priv(vb->vb2_queue);
-	unsigned long flags;
-
-	spin_lock_irqsave(&cru->qlock, flags);
 
+	guard(spinlock_irqsave)(&cru->qlock);
 	list_add_tail(to_buf_list(vbuf), &cru->buf_list);
-
-	spin_unlock_irqrestore(&cru->qlock, flags);
 }
 
 static void rzg2l_cru_set_slot_addr(struct rzg2l_cru_dev *cru,
@@ -465,7 +461,6 @@ void rzg2l_cru_disable_interrupts(struct rzg2l_cru_dev *cru)
 int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
 {
 	struct v4l2_mbus_framefmt *fmt = rzg2l_cru_ip_get_src_fmt(cru);
-	unsigned long flags;
 	u8 csi_vc;
 	int ret;
 
@@ -475,7 +470,7 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
 	csi_vc = ret;
 	cru->svc_channel = csi_vc;
 
-	spin_lock_irqsave(&cru->qlock, flags);
+	guard(spinlock_irqsave)(&cru->qlock);
 
 	/* Select a video input */
 	rzg2l_cru_write(cru, CRUnCTRL, CRUnCTRL_VINSEL(0));
@@ -492,7 +487,6 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
 	/* Initialize image convert */
 	ret = rzg2l_cru_initialize_image_conv(cru, fmt, csi_vc);
 	if (ret) {
-		spin_unlock_irqrestore(&cru->qlock, flags);
 		return ret;
 	}
 
@@ -502,8 +496,6 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
 	/* Enable image processing reception */
 	rzg2l_cru_write(cru, ICnEN, ICnEN_ICEN);
 
-	spin_unlock_irqrestore(&cru->qlock, flags);
-
 	return 0;
 }
 
@@ -573,16 +565,15 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
 {
 	struct rzg2l_cru_dev *cru = data;
 	unsigned int handled = 0;
-	unsigned long flags;
 	u32 irq_status;
 	u32 amnmbs;
 	int slot;
 
-	spin_lock_irqsave(&cru->qlock, flags);
+	guard(spinlock_irqsave)(&cru->qlock);
 
 	irq_status = rzg2l_cru_read(cru, CRUnINTS);
 	if (!irq_status)
-		goto done;
+		return IRQ_RETVAL(handled);
 
 	handled = 1;
 
@@ -591,14 +582,14 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
 	/* Nothing to do if capture status is 'RZG2L_CRU_DMA_STOPPED' */
 	if (cru->state == RZG2L_CRU_DMA_STOPPED) {
 		dev_dbg(cru->dev, "IRQ while state stopped\n");
-		goto done;
+		return IRQ_RETVAL(handled);
 	}
 
 	/* Increase stop retries if capture status is 'RZG2L_CRU_DMA_STOPPING' */
 	if (cru->state == RZG2L_CRU_DMA_STOPPING) {
 		if (irq_status & CRUnINTS_SFS)
 			dev_dbg(cru->dev, "IRQ while state stopping\n");
-		goto done;
+		return IRQ_RETVAL(handled);
 	}
 
 	/* Prepare for capture and update state */
@@ -621,7 +612,7 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
 	if (cru->state == RZG2L_CRU_DMA_STARTING) {
 		if (slot != 0) {
 			dev_dbg(cru->dev, "Starting sync slot: %d\n", slot);
-			goto done;
+			return IRQ_RETVAL(handled);
 		}
 
 		dev_dbg(cru->dev, "Capture start synced!\n");
@@ -646,9 +637,6 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
 	/* Prepare for next frame */
 	rzg2l_cru_fill_hw_slot(cru, slot);
 
-done:
-	spin_unlock_irqrestore(&cru->qlock, flags);
-
 	return IRQ_RETVAL(handled);
 }
 

-- 
2.53.0

Re: [PATCH 03/14] media: rzg2l-cru: Modernize spin_lock usage with cleanup.h

Posted by Lad, Prabhakar 2 days, 20 hours ago

Hi Jacopo,

Thank you for the patch.

On Fri, Mar 27, 2026 at 5:20 PM Jacopo Mondi
<jacopo.mondi@ideasonboard.com> wrote:
>
> From: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>
>
> Use more modern constructs from cleanup.h to express the locking
> sequences in the rzg2l driver.
>
> Signed-off-by: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>
> ---
>  .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 32 +++++++---------------
>  1 file changed, 10 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> index 98b6afbc708d..2d7ac9f37291 100644
> --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> @@ -11,6 +11,7 @@
>   * Copyright (C) 2008 Magnus Damm
>   */
>
> +#include <linux/cleanup.h>
As pointed out by Biju this needs to be spinlock.h.

Rest LGTM, with the above fixed,

Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

Cheers,
Prabhakar

>  #include <linux/clk.h>
>  #include <linux/delay.h>
>  #include <linux/pm_runtime.h>
> @@ -110,10 +111,10 @@ static void return_unused_buffers(struct rzg2l_cru_dev *cru,
>                                   enum vb2_buffer_state state)
>  {
>         struct rzg2l_cru_buffer *buf, *node;
> -       unsigned long flags;
>         unsigned int i;
>
> -       spin_lock_irqsave(&cru->qlock, flags);
> +       guard(spinlock_irqsave)(&cru->qlock);
> +
>         for (i = 0; i < cru->num_buf; i++) {
>                 if (cru->queue_buf[i]) {
>                         vb2_buffer_done(&cru->queue_buf[i]->vb2_buf,
> @@ -126,7 +127,6 @@ static void return_unused_buffers(struct rzg2l_cru_dev *cru,
>                 vb2_buffer_done(&buf->vb.vb2_buf, state);
>                 list_del(&buf->list);
>         }
> -       spin_unlock_irqrestore(&cru->qlock, flags);
>  }
>
>  static int rzg2l_cru_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
> @@ -165,13 +165,9 @@ static void rzg2l_cru_buffer_queue(struct vb2_buffer *vb)
>  {
>         struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
>         struct rzg2l_cru_dev *cru = vb2_get_drv_priv(vb->vb2_queue);
> -       unsigned long flags;
> -
> -       spin_lock_irqsave(&cru->qlock, flags);
>
> +       guard(spinlock_irqsave)(&cru->qlock);
>         list_add_tail(to_buf_list(vbuf), &cru->buf_list);
> -
> -       spin_unlock_irqrestore(&cru->qlock, flags);
>  }
>
>  static void rzg2l_cru_set_slot_addr(struct rzg2l_cru_dev *cru,
> @@ -465,7 +461,6 @@ void rzg2l_cru_disable_interrupts(struct rzg2l_cru_dev *cru)
>  int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>  {
>         struct v4l2_mbus_framefmt *fmt = rzg2l_cru_ip_get_src_fmt(cru);
> -       unsigned long flags;
>         u8 csi_vc;
>         int ret;
>
> @@ -475,7 +470,7 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>         csi_vc = ret;
>         cru->svc_channel = csi_vc;
>
> -       spin_lock_irqsave(&cru->qlock, flags);
> +       guard(spinlock_irqsave)(&cru->qlock);
>
>         /* Select a video input */
>         rzg2l_cru_write(cru, CRUnCTRL, CRUnCTRL_VINSEL(0));
> @@ -492,7 +487,6 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>         /* Initialize image convert */
>         ret = rzg2l_cru_initialize_image_conv(cru, fmt, csi_vc);
>         if (ret) {
> -               spin_unlock_irqrestore(&cru->qlock, flags);
>                 return ret;
>         }
>
> @@ -502,8 +496,6 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>         /* Enable image processing reception */
>         rzg2l_cru_write(cru, ICnEN, ICnEN_ICEN);
>
> -       spin_unlock_irqrestore(&cru->qlock, flags);
> -
>         return 0;
>  }
>
> @@ -573,16 +565,15 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>  {
>         struct rzg2l_cru_dev *cru = data;
>         unsigned int handled = 0;
> -       unsigned long flags;
>         u32 irq_status;
>         u32 amnmbs;
>         int slot;
>
> -       spin_lock_irqsave(&cru->qlock, flags);
> +       guard(spinlock_irqsave)(&cru->qlock);
>
>         irq_status = rzg2l_cru_read(cru, CRUnINTS);
>         if (!irq_status)
> -               goto done;
> +               return IRQ_RETVAL(handled);
>
>         handled = 1;
>
> @@ -591,14 +582,14 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>         /* Nothing to do if capture status is 'RZG2L_CRU_DMA_STOPPED' */
>         if (cru->state == RZG2L_CRU_DMA_STOPPED) {
>                 dev_dbg(cru->dev, "IRQ while state stopped\n");
> -               goto done;
> +               return IRQ_RETVAL(handled);
>         }
>
>         /* Increase stop retries if capture status is 'RZG2L_CRU_DMA_STOPPING' */
>         if (cru->state == RZG2L_CRU_DMA_STOPPING) {
>                 if (irq_status & CRUnINTS_SFS)
>                         dev_dbg(cru->dev, "IRQ while state stopping\n");
> -               goto done;
> +               return IRQ_RETVAL(handled);
>         }
>
>         /* Prepare for capture and update state */
> @@ -621,7 +612,7 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>         if (cru->state == RZG2L_CRU_DMA_STARTING) {
>                 if (slot != 0) {
>                         dev_dbg(cru->dev, "Starting sync slot: %d\n", slot);
> -                       goto done;
> +                       return IRQ_RETVAL(handled);
>                 }
>
>                 dev_dbg(cru->dev, "Capture start synced!\n");
> @@ -646,9 +637,6 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>         /* Prepare for next frame */
>         rzg2l_cru_fill_hw_slot(cru, slot);
>
> -done:
> -       spin_unlock_irqrestore(&cru->qlock, flags);
> -
>         return IRQ_RETVAL(handled);
>  }
>
>
> --
> 2.53.0
>
>

Re: [PATCH 03/14] media: rzg2l-cru: Modernize spin_lock usage with cleanup.h

Posted by Tommaso Merciai 3 days, 4 hours ago

Hi Jacopo,
Thanks for your patch.

On Fri, Mar 27, 2026 at 06:10:08PM +0100, Jacopo Mondi wrote:
> From: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>
> 
> Use more modern constructs from cleanup.h to express the locking
> sequences in the rzg2l driver.


Looks good to me.

Tested-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
Reviewed-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>

Kind Regards,
Tommaso

> 
> Signed-off-by: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>
> ---
>  .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 32 +++++++---------------
>  1 file changed, 10 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> index 98b6afbc708d..2d7ac9f37291 100644
> --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> @@ -11,6 +11,7 @@
>   * Copyright (C) 2008 Magnus Damm
>   */
>  
> +#include <linux/cleanup.h>
>  #include <linux/clk.h>
>  #include <linux/delay.h>
>  #include <linux/pm_runtime.h>
> @@ -110,10 +111,10 @@ static void return_unused_buffers(struct rzg2l_cru_dev *cru,
>  				  enum vb2_buffer_state state)
>  {
>  	struct rzg2l_cru_buffer *buf, *node;
> -	unsigned long flags;
>  	unsigned int i;
>  
> -	spin_lock_irqsave(&cru->qlock, flags);
> +	guard(spinlock_irqsave)(&cru->qlock);
> +
>  	for (i = 0; i < cru->num_buf; i++) {
>  		if (cru->queue_buf[i]) {
>  			vb2_buffer_done(&cru->queue_buf[i]->vb2_buf,
> @@ -126,7 +127,6 @@ static void return_unused_buffers(struct rzg2l_cru_dev *cru,
>  		vb2_buffer_done(&buf->vb.vb2_buf, state);
>  		list_del(&buf->list);
>  	}
> -	spin_unlock_irqrestore(&cru->qlock, flags);
>  }
>  
>  static int rzg2l_cru_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
> @@ -165,13 +165,9 @@ static void rzg2l_cru_buffer_queue(struct vb2_buffer *vb)
>  {
>  	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
>  	struct rzg2l_cru_dev *cru = vb2_get_drv_priv(vb->vb2_queue);
> -	unsigned long flags;
> -
> -	spin_lock_irqsave(&cru->qlock, flags);
>  
> +	guard(spinlock_irqsave)(&cru->qlock);
>  	list_add_tail(to_buf_list(vbuf), &cru->buf_list);
> -
> -	spin_unlock_irqrestore(&cru->qlock, flags);
>  }
>  
>  static void rzg2l_cru_set_slot_addr(struct rzg2l_cru_dev *cru,
> @@ -465,7 +461,6 @@ void rzg2l_cru_disable_interrupts(struct rzg2l_cru_dev *cru)
>  int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>  {
>  	struct v4l2_mbus_framefmt *fmt = rzg2l_cru_ip_get_src_fmt(cru);
> -	unsigned long flags;
>  	u8 csi_vc;
>  	int ret;
>  
> @@ -475,7 +470,7 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>  	csi_vc = ret;
>  	cru->svc_channel = csi_vc;
>  
> -	spin_lock_irqsave(&cru->qlock, flags);
> +	guard(spinlock_irqsave)(&cru->qlock);
>  
>  	/* Select a video input */
>  	rzg2l_cru_write(cru, CRUnCTRL, CRUnCTRL_VINSEL(0));
> @@ -492,7 +487,6 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>  	/* Initialize image convert */
>  	ret = rzg2l_cru_initialize_image_conv(cru, fmt, csi_vc);
>  	if (ret) {
> -		spin_unlock_irqrestore(&cru->qlock, flags);
>  		return ret;
>  	}
>  
> @@ -502,8 +496,6 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>  	/* Enable image processing reception */
>  	rzg2l_cru_write(cru, ICnEN, ICnEN_ICEN);
>  
> -	spin_unlock_irqrestore(&cru->qlock, flags);
> -
>  	return 0;
>  }
>  
> @@ -573,16 +565,15 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>  {
>  	struct rzg2l_cru_dev *cru = data;
>  	unsigned int handled = 0;
> -	unsigned long flags;
>  	u32 irq_status;
>  	u32 amnmbs;
>  	int slot;
>  
> -	spin_lock_irqsave(&cru->qlock, flags);
> +	guard(spinlock_irqsave)(&cru->qlock);
>  
>  	irq_status = rzg2l_cru_read(cru, CRUnINTS);
>  	if (!irq_status)
> -		goto done;
> +		return IRQ_RETVAL(handled);
>  
>  	handled = 1;
>  
> @@ -591,14 +582,14 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>  	/* Nothing to do if capture status is 'RZG2L_CRU_DMA_STOPPED' */
>  	if (cru->state == RZG2L_CRU_DMA_STOPPED) {
>  		dev_dbg(cru->dev, "IRQ while state stopped\n");
> -		goto done;
> +		return IRQ_RETVAL(handled);
>  	}
>  
>  	/* Increase stop retries if capture status is 'RZG2L_CRU_DMA_STOPPING' */
>  	if (cru->state == RZG2L_CRU_DMA_STOPPING) {
>  		if (irq_status & CRUnINTS_SFS)
>  			dev_dbg(cru->dev, "IRQ while state stopping\n");
> -		goto done;
> +		return IRQ_RETVAL(handled);
>  	}
>  
>  	/* Prepare for capture and update state */
> @@ -621,7 +612,7 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>  	if (cru->state == RZG2L_CRU_DMA_STARTING) {
>  		if (slot != 0) {
>  			dev_dbg(cru->dev, "Starting sync slot: %d\n", slot);
> -			goto done;
> +			return IRQ_RETVAL(handled);
>  		}
>  
>  		dev_dbg(cru->dev, "Capture start synced!\n");
> @@ -646,9 +637,6 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>  	/* Prepare for next frame */
>  	rzg2l_cru_fill_hw_slot(cru, slot);
>  
> -done:
> -	spin_unlock_irqrestore(&cru->qlock, flags);
> -
>  	return IRQ_RETVAL(handled);
>  }
>  
> 
> -- 
> 2.53.0
>

Re: [PATCH 03/14] media: rzg2l-cru: Modernize spin_lock usage with cleanup.h

Posted by Dan Scally 3 days, 8 hours ago

Morning Jacopo - thanks for the set

On 27/03/2026 17:10, Jacopo Mondi wrote:
> From: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>
> 
> Use more modern constructs from cleanup.h to express the locking
> sequences in the rzg2l driver.
> 
> Signed-off-by: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>
> ---

Looks good to me:

Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>

>   .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 32 +++++++---------------
>   1 file changed, 10 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> index 98b6afbc708d..2d7ac9f37291 100644
> --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
> @@ -11,6 +11,7 @@
>    * Copyright (C) 2008 Magnus Damm
>    */
>   
> +#include <linux/cleanup.h>
>   #include <linux/clk.h>
>   #include <linux/delay.h>
>   #include <linux/pm_runtime.h>
> @@ -110,10 +111,10 @@ static void return_unused_buffers(struct rzg2l_cru_dev *cru,
>   				  enum vb2_buffer_state state)
>   {
>   	struct rzg2l_cru_buffer *buf, *node;
> -	unsigned long flags;
>   	unsigned int i;
>   
> -	spin_lock_irqsave(&cru->qlock, flags);
> +	guard(spinlock_irqsave)(&cru->qlock);
> +
>   	for (i = 0; i < cru->num_buf; i++) {
>   		if (cru->queue_buf[i]) {
>   			vb2_buffer_done(&cru->queue_buf[i]->vb2_buf,
> @@ -126,7 +127,6 @@ static void return_unused_buffers(struct rzg2l_cru_dev *cru,
>   		vb2_buffer_done(&buf->vb.vb2_buf, state);
>   		list_del(&buf->list);
>   	}
> -	spin_unlock_irqrestore(&cru->qlock, flags);
>   }
>   
>   static int rzg2l_cru_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
> @@ -165,13 +165,9 @@ static void rzg2l_cru_buffer_queue(struct vb2_buffer *vb)
>   {
>   	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
>   	struct rzg2l_cru_dev *cru = vb2_get_drv_priv(vb->vb2_queue);
> -	unsigned long flags;
> -
> -	spin_lock_irqsave(&cru->qlock, flags);
>   
> +	guard(spinlock_irqsave)(&cru->qlock);
>   	list_add_tail(to_buf_list(vbuf), &cru->buf_list);
> -
> -	spin_unlock_irqrestore(&cru->qlock, flags);
>   }
>   
>   static void rzg2l_cru_set_slot_addr(struct rzg2l_cru_dev *cru,
> @@ -465,7 +461,6 @@ void rzg2l_cru_disable_interrupts(struct rzg2l_cru_dev *cru)
>   int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>   {
>   	struct v4l2_mbus_framefmt *fmt = rzg2l_cru_ip_get_src_fmt(cru);
> -	unsigned long flags;
>   	u8 csi_vc;
>   	int ret;
>   
> @@ -475,7 +470,7 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>   	csi_vc = ret;
>   	cru->svc_channel = csi_vc;
>   
> -	spin_lock_irqsave(&cru->qlock, flags);
> +	guard(spinlock_irqsave)(&cru->qlock);
>   
>   	/* Select a video input */
>   	rzg2l_cru_write(cru, CRUnCTRL, CRUnCTRL_VINSEL(0));
> @@ -492,7 +487,6 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>   	/* Initialize image convert */
>   	ret = rzg2l_cru_initialize_image_conv(cru, fmt, csi_vc);
>   	if (ret) {
> -		spin_unlock_irqrestore(&cru->qlock, flags);
>   		return ret;
>   	}
>   
> @@ -502,8 +496,6 @@ int rzg2l_cru_start_image_processing(struct rzg2l_cru_dev *cru)
>   	/* Enable image processing reception */
>   	rzg2l_cru_write(cru, ICnEN, ICnEN_ICEN);
>   
> -	spin_unlock_irqrestore(&cru->qlock, flags);
> -
>   	return 0;
>   }
>   
> @@ -573,16 +565,15 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>   {
>   	struct rzg2l_cru_dev *cru = data;
>   	unsigned int handled = 0;
> -	unsigned long flags;
>   	u32 irq_status;
>   	u32 amnmbs;
>   	int slot;
>   
> -	spin_lock_irqsave(&cru->qlock, flags);
> +	guard(spinlock_irqsave)(&cru->qlock);
>   
>   	irq_status = rzg2l_cru_read(cru, CRUnINTS);
>   	if (!irq_status)
> -		goto done;
> +		return IRQ_RETVAL(handled);
>   
>   	handled = 1;
>   
> @@ -591,14 +582,14 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>   	/* Nothing to do if capture status is 'RZG2L_CRU_DMA_STOPPED' */
>   	if (cru->state == RZG2L_CRU_DMA_STOPPED) {
>   		dev_dbg(cru->dev, "IRQ while state stopped\n");
> -		goto done;
> +		return IRQ_RETVAL(handled);
>   	}
>   
>   	/* Increase stop retries if capture status is 'RZG2L_CRU_DMA_STOPPING' */
>   	if (cru->state == RZG2L_CRU_DMA_STOPPING) {
>   		if (irq_status & CRUnINTS_SFS)
>   			dev_dbg(cru->dev, "IRQ while state stopping\n");
> -		goto done;
> +		return IRQ_RETVAL(handled);
>   	}
>   
>   	/* Prepare for capture and update state */
> @@ -621,7 +612,7 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>   	if (cru->state == RZG2L_CRU_DMA_STARTING) {
>   		if (slot != 0) {
>   			dev_dbg(cru->dev, "Starting sync slot: %d\n", slot);
> -			goto done;
> +			return IRQ_RETVAL(handled);
>   		}
>   
>   		dev_dbg(cru->dev, "Capture start synced!\n");
> @@ -646,9 +637,6 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data)
>   	/* Prepare for next frame */
>   	rzg2l_cru_fill_hw_slot(cru, slot);
>   
> -done:
> -	spin_unlock_irqrestore(&cru->qlock, flags);
> -
>   	return IRQ_RETVAL(handled);
>   }
>   
>