media: renesas: vsp1: Use spinlock scoped guards

Replace remaining manual spinlock locking and unlocking with scoped
guards. This simplifies error paths and reduces the amount of code.

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://patch.msgid.link/20260511235637.3468558-9-laurent.pinchart+renesas@ideasonboard.com
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_clu.c b/drivers/media/platform/renesas/vsp1/vsp1_clu.c
index 04c466c4da8149931ec38bd500a8b1f45979ff15..a6e4bcab5101af595754b25355d39e4e58591b07 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_clu.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_clu.c
@@ -53,9 +53,9 @@ static int clu_set_table(struct vsp1_clu *clu, struct v4l2_ctrl *ctrl)
        for (i = 0; i < CLU_SIZE; ++i)
                vsp1_dl_body_write(dlb, VI6_CLU_DATA, ctrl->p_new.p_u32[i]);
 
-       spin_lock_irq(&clu->lock);
-       swap(clu->clu, dlb);
-       spin_unlock_irq(&clu->lock);
+       scoped_guard(spinlock_irq, &clu->lock) {
+               swap(clu->clu, dlb);
+       }
 
        vsp1_dl_body_put(dlb);
        return 0;
@@ -162,7 +162,6 @@ static void clu_configure_frame(struct vsp1_entity *entity,
 {
        struct vsp1_clu *clu = to_clu(&entity->subdev);
        struct vsp1_dl_body *clu_dlb;
-       unsigned long flags;
        u32 ctrl = VI6_CLU_CTRL_AAI | VI6_CLU_CTRL_MVS | VI6_CLU_CTRL_EN;
 
        /* 2D mode can only be used with the YCbCr pixel encoding. */
@@ -173,10 +172,10 @@ static void clu_configure_frame(struct vsp1_entity *entity,
 
        vsp1_clu_write(clu, dlb, VI6_CLU_CTRL, ctrl);
 
-       spin_lock_irqsave(&clu->lock, flags);
-       clu_dlb = clu->clu;
-       clu->clu = NULL;
-       spin_unlock_irqrestore(&clu->lock, flags);
+       scoped_guard(spinlock_irqsave, &clu->lock) {
+               clu_dlb = clu->clu;
+               clu->clu = NULL;
+       }
 
        if (clu_dlb) {
                vsp1_dl_list_add_body(dl, clu_dlb);

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_dl.c b/drivers/media/platform/renesas/vsp1/vsp1_dl.c
index 4a19ff1437b08765cda0e4fbba3d22cc704bdc90..3dc74fed91dcd9d46b497339399cfa5c3e436f23 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_dl.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_dl.c
@@ -1064,17 +1064,15 @@ void vsp1_dlm_setup(struct vsp1_device *vsp1)
 
 void vsp1_dlm_reset(struct vsp1_dl_manager *dlm)
 {
-       unsigned long flags;
        size_t list_count;
 
-       spin_lock_irqsave(&dlm->lock, flags);
-
-       __vsp1_dl_list_put(dlm->active);
-       __vsp1_dl_list_put(dlm->queued);
-       __vsp1_dl_list_put(dlm->pending);
+       scoped_guard(spinlock_irqsave, &dlm->lock) {
+               __vsp1_dl_list_put(dlm->active);
+               __vsp1_dl_list_put(dlm->queued);
+               __vsp1_dl_list_put(dlm->pending);
 
-       list_count = list_count_nodes(&dlm->free);
-       spin_unlock_irqrestore(&dlm->lock, flags);
+               list_count = list_count_nodes(&dlm->free);
+       }
 
        WARN_ON_ONCE(list_count != dlm->list_count);
 

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drm.c b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
index 2b64d9b5a81c991bfbf959627cf0bf51ff616934..f6fbd347532930cdace475cf4af600489044554c 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_drm.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
@@ -655,7 +655,6 @@ int vsp1_du_enable(struct device *dev, unsigned int pipe_index,
        struct vsp1_device *vsp1 = dev_get_drvdata(dev);
        struct vsp1_drm_pipeline *drm_pipe;
        struct vsp1_pipeline *pipe;
-       unsigned long flags;
        int ret;
 
        if (pipe_index >= vsp1->info->lif_count)
@@ -708,9 +707,9 @@ int vsp1_du_enable(struct device *dev, unsigned int pipe_index,
        }
 
        /* Start the pipeline. */
-       spin_lock_irqsave(&pipe->irqlock, flags);
-       vsp1_pipeline_run(pipe);
-       spin_unlock_irqrestore(&pipe->irqlock, flags);
+       scoped_guard(spinlock_irqsave, &pipe->irqlock) {
+               vsp1_pipeline_run(pipe);
+       }
 
        dev_dbg(vsp1->dev, "%s: pipeline enabled\n", __func__);
 

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_lut.c b/drivers/media/platform/renesas/vsp1/vsp1_lut.c
index 94bdedcc5c9234aae5937cabae79d51a34448e9a..a22c31e17cb7a6a32782acbc25143b78a1266d94 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_lut.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_lut.c
@@ -50,9 +50,9 @@ static int lut_set_table(struct vsp1_lut *lut, struct v4l2_ctrl *ctrl)
                vsp1_dl_body_write(dlb, VI6_LUT_TABLE + 4 * i,
                                       ctrl->p_new.p_u32[i]);
 
-       spin_lock_irq(&lut->lock);
-       swap(lut->lut, dlb);
-       spin_unlock_irq(&lut->lock);
+       scoped_guard(spinlock_irq, &lut->lock) {
+               swap(lut->lut, dlb);
+       }
 
        vsp1_dl_body_put(dlb);
        return 0;
@@ -132,12 +132,11 @@ static void lut_configure_frame(struct vsp1_entity *entity,
 {
        struct vsp1_lut *lut = to_lut(&entity->subdev);
        struct vsp1_dl_body *lut_dlb;
-       unsigned long flags;
 
-       spin_lock_irqsave(&lut->lock, flags);
-       lut_dlb = lut->lut;
-       lut->lut = NULL;
-       spin_unlock_irqrestore(&lut->lock, flags);
+       scoped_guard(spinlock_irqsave, &lut->lock) {
+               lut_dlb = lut->lut;
+               lut->lut = NULL;
+       }
 
        if (lut_dlb) {
                vsp1_dl_list_add_body(dl, lut_dlb);

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_pipe.c b/drivers/media/platform/renesas/vsp1/vsp1_pipe.c
index 9e2b9b15331a42dcc2a9fd3ff30285cc0dbfe879..12079fbdc3d3139c52e2ff893746f605b2970023 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_pipe.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_pipe.c
@@ -496,7 +496,6 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
 {
        struct vsp1_device *vsp1 = pipe->output->entity.vsp1;
        struct vsp1_entity *entity;
-       unsigned long flags;
        int ret;
 
        if (pipe->lif) {
@@ -506,16 +505,16 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
                 */
                ret = vsp1_reset_wpf(vsp1, pipe->output->entity.index);
                if (ret == 0) {
-                       spin_lock_irqsave(&pipe->irqlock, flags);
-                       pipe->state = VSP1_PIPELINE_STOPPED;
-                       spin_unlock_irqrestore(&pipe->irqlock, flags);
+                       scoped_guard(spinlock_irqsave, &pipe->irqlock) {
+                               pipe->state = VSP1_PIPELINE_STOPPED;
+                       }
                }
        } else {
                /* Otherwise just request a stop and wait. */
-               spin_lock_irqsave(&pipe->irqlock, flags);
-               if (pipe->state == VSP1_PIPELINE_RUNNING)
-                       pipe->state = VSP1_PIPELINE_STOPPING;
-               spin_unlock_irqrestore(&pipe->irqlock, flags);
+               scoped_guard(spinlock_irqsave, &pipe->irqlock) {
+                       if (pipe->state == VSP1_PIPELINE_RUNNING)
+                               pipe->state = VSP1_PIPELINE_STOPPING;
+               }
 
                ret = wait_event_timeout(pipe->wq, vsp1_pipeline_stopped(pipe),
                                         msecs_to_jiffies(500));

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_video.c b/drivers/media/platform/renesas/vsp1/vsp1_video.c
index b5b82e12fcb129d2361fb9044bed6c7d103cc9c4..5a1d284213adfb2404d68e6555290ccfd9ef2687 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_video.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_video.c
@@ -209,26 +209,21 @@ vsp1_video_complete_buffer(struct vsp1_video *video)
        struct vsp1_pipeline *pipe = video->rwpf->entity.pipe;
        struct vsp1_vb2_buffer *next = NULL;
        struct vsp1_vb2_buffer *done;
-       unsigned long flags;
        unsigned int i;
 
-       spin_lock_irqsave(&video->irqlock, flags);
-
-       if (list_empty(&video->irqqueue)) {
-               spin_unlock_irqrestore(&video->irqlock, flags);
-               return NULL;
-       }
-
-       done = list_first_entry(&video->irqqueue,
-                               struct vsp1_vb2_buffer, queue);
-
-       list_del(&done->queue);
+       scoped_guard(spinlock_irqsave, &video->irqlock) {
+               if (list_empty(&video->irqqueue))
+                       return NULL;
 
-       if (!list_empty(&video->irqqueue))
-               next = list_first_entry(&video->irqqueue,
+               done = list_first_entry(&video->irqqueue,
                                        struct vsp1_vb2_buffer, queue);
 
-       spin_unlock_irqrestore(&video->irqlock, flags);
+               list_del(&done->queue);
+
+               if (!list_empty(&video->irqqueue))
+                       next = list_first_entry(&video->irqqueue,
+                                               struct vsp1_vb2_buffer, queue);
+       }
 
        done->buf.sequence = pipe->sequence;
        done->buf.vb2_buf.timestamp = ktime_get_ns();
@@ -661,13 +656,12 @@ static void vsp1_video_buffer_queue(struct vb2_buffer *vb)
        struct vsp1_video *video = vb2_get_drv_priv(vb->vb2_queue);
        struct vsp1_pipeline *pipe = video->rwpf->entity.pipe;
        struct vsp1_vb2_buffer *buf = to_vsp1_vb2_buffer(vbuf);
-       unsigned long flags;
        bool empty;
 
-       spin_lock_irqsave(&video->irqlock, flags);
-       empty = list_empty(&video->irqqueue);
-       list_add_tail(&buf->queue, &video->irqqueue);
-       spin_unlock_irqrestore(&video->irqlock, flags);
+       scoped_guard(spinlock_irqsave, &video->irqlock) {
+               empty = list_empty(&video->irqqueue);
+               list_add_tail(&buf->queue, &video->irqqueue);
+       }
 
        if (!empty)
                return;
@@ -848,16 +842,15 @@ static void vsp1_video_stop_streaming(struct vb2_queue *vq)
 {
        struct vsp1_video *video = vb2_get_drv_priv(vq);
        struct vsp1_pipeline *pipe = video->rwpf->entity.pipe;
-       unsigned long flags;
        int ret;
 
        /*
         * Clear the buffers ready flag to make sure the device won't be started
         * by a QBUF on the video node on the other side of the pipeline.
         */
-       spin_lock_irqsave(&video->irqlock, flags);
-       pipe->buffers_ready &= ~(1 << video->pipe_index);
-       spin_unlock_irqrestore(&video->irqlock, flags);
+       scoped_guard(spinlock_irqsave, &video->irqlock) {
+               pipe->buffers_ready &= ~(1 << video->pipe_index);
+       }
 
        scoped_guard(mutex, &pipe->lock) {
                if (--pipe->stream_count == pipe->num_inputs) {
@@ -1123,7 +1116,6 @@ static const struct media_entity_operations vsp1_video_media_ops = {
 
 void vsp1_video_suspend(struct vsp1_device *vsp1)
 {
-       unsigned long flags;
        unsigned int i;
        int ret;
 
@@ -1143,10 +1135,10 @@ void vsp1_video_suspend(struct vsp1_device *vsp1)
                if (pipe == NULL)
                        continue;
 
-               spin_lock_irqsave(&pipe->irqlock, flags);
-               if (pipe->state == VSP1_PIPELINE_RUNNING)
-                       pipe->state = VSP1_PIPELINE_STOPPING;
-               spin_unlock_irqrestore(&pipe->irqlock, flags);
+               scoped_guard(spinlock_irqsave, &pipe->irqlock) {
+                       if (pipe->state == VSP1_PIPELINE_RUNNING)
+                               pipe->state = VSP1_PIPELINE_STOPPING;
+               }
        }
 
        for (i = 0; i < vsp1->info->wpf_count; ++i) {
@@ -1170,7 +1162,6 @@ void vsp1_video_suspend(struct vsp1_device *vsp1)
 
 void vsp1_video_resume(struct vsp1_device *vsp1)
 {
-       unsigned long flags;
        unsigned int i;
 
        /* Resume all running pipelines. */
@@ -1191,10 +1182,10 @@ void vsp1_video_resume(struct vsp1_device *vsp1)
                 */
                pipe->configured = false;
 
-               spin_lock_irqsave(&pipe->irqlock, flags);
-               if (vsp1_pipeline_ready(pipe))
-                       vsp1_video_pipeline_run(pipe);
-               spin_unlock_irqrestore(&pipe->irqlock, flags);
+               scoped_guard(spinlock_irqsave, &pipe->irqlock) {
+                       if (vsp1_pipeline_ready(pipe))
+                               vsp1_video_pipeline_run(pipe);
+               }
        }
 }
 

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_wpf.c b/drivers/media/platform/renesas/vsp1/vsp1_wpf.c
index 327c7457126f84f81da7f1be437d8ce05bfb29d9..0ec707d2913f1c1e0c347d5619664fe0d8167b6d 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_wpf.c
@@ -366,13 +366,12 @@ static void wpf_configure_frame(struct vsp1_entity *entity,
        const unsigned int mask = BIT(WPF_CTRL_VFLIP)
                                | BIT(WPF_CTRL_HFLIP);
        struct vsp1_rwpf *wpf = to_rwpf(&entity->subdev);
-       unsigned long flags;
        u32 outfmt;
 
-       spin_lock_irqsave(&wpf->flip.lock, flags);
-       wpf->flip.active = (wpf->flip.active & ~mask)
-                        | (wpf->flip.pending & mask);
-       spin_unlock_irqrestore(&wpf->flip.lock, flags);
+       scoped_guard(spinlock_irqsave, &wpf->flip.lock) {
+               wpf->flip.active = (wpf->flip.active & ~mask)
+                                | (wpf->flip.pending & mask);
+       }
 
        outfmt = (wpf->alpha << VI6_WPF_OUTFMT_PDV_SHIFT) | wpf->outfmt;