浏览代码

[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>
Lad, Prabhakar 11 年之前
父节点
当前提交
dbe2840a3e
共有 2 个文件被更改,包括 0 次插入10 次删除
  1. 0 5
      drivers/media/platform/davinci/vpif_capture.c
  2. 0 5
      drivers/media/platform/davinci/vpif_capture.h

+ 0 - 5
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");
 	vpif_dbg(2, debug, "vpif_config_format\n");
 
 
 	common->fmt.fmt.pix.field = V4L2_FIELD_ANY;
 	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
 	common->fmt.fmt.pix.sizeimage
 	    = config_params.channel_bufsize[ch->channel_id];
 	    = config_params.channel_bufsize[ch->channel_id];
 
 

+ 0 - 5
drivers/media/platform/davinci/vpif_capture.h

@@ -63,11 +63,6 @@ struct common_obj {
 	struct vpif_cap_buffer *cur_frm;
 	struct vpif_cap_buffer *cur_frm;
 	/* Pointer pointing to current v4l2_buffer */
 	/* Pointer pointing to current v4l2_buffer */
 	struct vpif_cap_buffer *next_frm;
 	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 */
 	/* Used to store pixel format */
 	struct v4l2_format fmt;
 	struct v4l2_format fmt;
 	/* Buffer queue used in video-buf */
 	/* Buffer queue used in video-buf */