From f690abdc51add26de4bcaed01b72761496b41d96 Mon Sep 17 00:00:00 2001 From: Dafna Hirschfeld Date: Thu, 6 Aug 2020 12:34:13 +0200 Subject: [PATCH] media: staging: rkisp1: don't define vaddr field in rkisp1_buffer as an array The field vaddr in rkisp1_buffer struct is used only by the rkisp1-stats and rkisp1-params entities and they both use only vaddr[0] so there is no need to define this field as an array. Signed-off-by: Dafna Hirschfeld Acked-by: Helen Koike Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/rkisp1/rkisp1-common.h | 2 +- drivers/staging/media/rkisp1/rkisp1-params.c | 4 ++-- drivers/staging/media/rkisp1/rkisp1-stats.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h index 3dc51d7..e54793d 100644 --- a/drivers/staging/media/rkisp1/rkisp1-common.h +++ b/drivers/staging/media/rkisp1/rkisp1-common.h @@ -127,7 +127,7 @@ struct rkisp1_buffer { struct list_head queue; union { u32 buff_addr[VIDEO_MAX_PLANES]; - void *vaddr[VIDEO_MAX_PLANES]; + void *vaddr; }; }; diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c index 6140e6c..416e3a2 100644 --- a/drivers/staging/media/rkisp1/rkisp1-params.c +++ b/drivers/staging/media/rkisp1/rkisp1-params.c @@ -1209,7 +1209,7 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1, u32 isp_mis) if (!cur_buf) return; - new_params = (struct rkisp1_params_cfg *)(cur_buf->vaddr[0]); + new_params = (struct rkisp1_params_cfg *)(cur_buf->vaddr); if (isp_mis & RKISP1_CIF_ISP_FRAME) { u32 isp_ctrl; @@ -1457,7 +1457,7 @@ static void rkisp1_params_vb2_buf_queue(struct vb2_buffer *vb) return; } - params_buf->vaddr[0] = vb2_plane_vaddr(vb, 0); + params_buf->vaddr = vb2_plane_vaddr(vb, 0); spin_lock_irqsave(¶ms->config_lock, flags); list_add_tail(¶ms_buf->queue, ¶ms->params); spin_unlock_irqrestore(¶ms->config_lock, flags); diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/staging/media/rkisp1/rkisp1-stats.c index 43be7e5..967d67a 100644 --- a/drivers/staging/media/rkisp1/rkisp1-stats.c +++ b/drivers/staging/media/rkisp1/rkisp1-stats.c @@ -116,7 +116,7 @@ static void rkisp1_stats_vb2_buf_queue(struct vb2_buffer *vb) struct vb2_queue *vq = vb->vb2_queue; struct rkisp1_stats *stats_dev = vq->drv_priv; - stats_buf->vaddr[0] = vb2_plane_vaddr(vb, 0); + stats_buf->vaddr = vb2_plane_vaddr(vb, 0); spin_lock_irq(&stats_dev->lock); list_add_tail(&stats_buf->queue, &stats_dev->stat); @@ -322,7 +322,7 @@ rkisp1_stats_send_measurement(struct rkisp1_stats *stats, u32 isp_ris) return; cur_stat_buf = - (struct rkisp1_stat_buffer *)(cur_buf->vaddr[0]); + (struct rkisp1_stat_buffer *)(cur_buf->vaddr); if (isp_ris & RKISP1_CIF_ISP_AWB_DONE) rkisp1_stats_get_awb_meas(stats, cur_stat_buf); -- 2.7.4