leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: staging: rkisp1: don't define vaddr field in rkisp1_buffer as an array

Browse Source 
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 <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Dafna Hirschfeld 2020-08-06 12:34:13 +02:00 committed by Mauro Carvalho Chehab
parent a096ddb477
commit f690abdc51
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/media/rkisp1/rkisp1-common.h
View File

@ -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;
};
};

4
drivers/staging/media/rkisp1/rkisp1-params.c
View File

@ -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(&params->config_lock, flags);
list_add_tail(&params_buf->queue, &params->params);
spin_unlock_irqrestore(&params->config_lock, flags);

4
drivers/staging/media/rkisp1/rkisp1-stats.c
View File

@ -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);