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

This field is set, but not used anymore. Remove it.
No functional changes.

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_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 41cd3fffa485385111b6c2d3555686259c01de2e..6b66f55d09a0b150dcaa157cbc8a5caad7e3b52e 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -608,11 +608,6 @@ static void vpif_config_format(struct channel_obj *ch)
        vpif_dbg(2, debug, "vpif_config_format\n");
 
        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];
 

diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/davinci/vpif_capture.h
index f60081934c1198ef09fafa0ec19a0ac96b87df18..9b7dd06bfb0a9debe5d7970c9066937cf5ece7a8 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.h
+++ b/drivers/media/platform/davinci/vpif_capture.h
@@ -63,11 +63,6 @@ struct common_obj {
        struct vpif_cap_buffer *cur_frm;
        /* Pointer pointing to current v4l2_buffer */
        struct vpif_cap_buffer *next_frm;
-       /*
-        * This field keeps track of type of buffer exchange mechanism
-        * user has selected
-        */
-       enum v4l2_memory memory;
        /* Used to store pixel format */
        struct v4l2_format fmt;
        /* Buffer queue used in video-buf */