Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7cfbbbb authored May 16, 2014 by Lad, Prabhakar Committed by Mauro Carvalho Chehab May 23, 2014

[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>

parent 81c9b7fa

drivers/media/platform/davinci/vpif_display.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -572,11 +572,6 @@ static void vpif_config_format(struct channel_obj *ch)
	struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];		struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];

	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];
	common->fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV422P;		common->fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV422P;

drivers/media/platform/davinci/vpif_display.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -72,9 +72,6 @@ struct common_obj {
	* vb2_buffer */		* vb2_buffer */
	struct vpif_disp_buffer next_frm; / Pointer pointing to next		struct vpif_disp_buffer next_frm; / Pointer pointing to next
	* vb2_buffer */		* 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 v4l2_format fmt; /* Used to store the format */
	struct vb2_queue buffer_queue; /* Buffer queue used in		struct vb2_queue buffer_queue; /* Buffer queue used in
	* video-buf */		* video-buf */