[media] media: davinci: vpif_display: drop unnecessary field memory

The common->memory field is set but not used anywhere. Drop it.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index bfe1e5087743e3d8f877567d57f1cbf754e67473..ab097ce77f0d18ae65cfa23214e6ba3545500cbe 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -572,11 +572,6 @@ static void vpif_config_format(struct channel_obj *ch)
        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
 
        common->fmt.fmt.pix.field = V4L2_FIELD_ANY;
-       if (config_params.numbuffers[ch->channel_id] == 0)
-               common->memory = V4L2_MEMORY_USERPTR;
-       else
-               common->memory = V4L2_MEMORY_MMAP;
-
        common->fmt.fmt.pix.sizeimage =
                        config_params.channel_bufsize[ch->channel_id];
        common->fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV422P;

diff --git a/drivers/media/platform/davinci/vpif_display.h b/drivers/media/platform/davinci/vpif_display.h
index b22bb337c871dbd3544c5e3050cda0f88a86fd3c..06b8d246502e070116c1aec10e57f5a46c7d3d3c 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.h
+++ b/drivers/media/platform/davinci/vpif_display.h
@@ -72,9 +72,6 @@ struct common_obj {
                                                 * vb2_buffer */
        struct vpif_disp_buffer *next_frm;      /* Pointer pointing to next
                                                 * vb2_buffer */
-       enum v4l2_memory memory;                /* This field keeps track of
-                                                * type of buffer exchange
-                                                * method user has selected */
        struct v4l2_format fmt;                 /* Used to store the format */
        struct vb2_queue buffer_queue;          /* Buffer queue used in
                                                 * video-buf */