media: rkisp1: remove field 'vaddr' from 'rkisp1_buffer'

The virtual address can be accessed using vb2_plane_vaddr
therefore there is no need to save it in an extra field in
'rkisp1_buffer'. Remove it.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 038c303..bb73f4e 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -156,15 +156,11 @@ struct rkisp1_vdev_node {
  * @vb:                vb2 buffer
  * @queue:     entry of the buffer in the queue
  * @buff_addr: dma addresses of each plane, used only by the capture devices: selfpath, mainpath
- * @vaddr:     virtual address for buffers used by params and stats devices
  */
 struct rkisp1_buffer {
        struct vb2_v4l2_buffer vb;
        struct list_head queue;
-       union {
-               u32 buff_addr[VIDEO_MAX_PLANES];
-               void *vaddr;
-       };
+       u32 buff_addr[VIDEO_MAX_PLANES];
 };
 
 /*

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 529c6e2..8fa5b0a 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -1143,7 +1143,7 @@ static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
        cur_buf = list_first_entry(&params->params,
                                   struct rkisp1_buffer, queue);
 
-       new_params = (struct rkisp1_params_cfg *)(cur_buf->vaddr);
+       new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
 
        rkisp1_isp_isr_other_config(params, new_params);
        rkisp1_isp_isr_meas_config(params, new_params);
@@ -1382,7 +1382,6 @@ static void rkisp1_params_vb2_buf_queue(struct vb2_buffer *vb)
        struct vb2_queue *vq = vb->vb2_queue;
        struct rkisp1_params *params = vq->drv_priv;
 
-       params_buf->vaddr = vb2_plane_vaddr(vb, 0);
        spin_lock_irq(&params->config_lock);
        list_add_tail(&params_buf->queue, &params->params);
        spin_unlock_irq(&params->config_lock);

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
index c1d07a2..e88bdd6 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
@@ -112,7 +112,6 @@ 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 = vb2_plane_vaddr(vb, 0);
 
        spin_lock_irq(&stats_dev->lock);
        list_add_tail(&stats_buf->queue, &stats_dev->stat);
@@ -305,9 +304,8 @@ rkisp1_stats_send_measurement(struct rkisp1_stats *stats, u32 isp_ris)
        if (!cur_buf)
                return;
 
-       cur_stat_buf =
-               (struct rkisp1_stat_buffer *)(cur_buf->vaddr);
-
+       cur_stat_buf = (struct rkisp1_stat_buffer *)
+                       vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
        if (isp_ris & RKISP1_CIF_ISP_AWB_DONE)
                rkisp1_stats_get_awb_meas(stats, cur_stat_buf);