From: Lad, Prabhakar Date: Fri, 16 May 2014 13:33:19 +0000 (-0300) Subject: [media] media: davinci: vpif_display: drop unnecessary field memory X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f7cfbbbb02fd9588b802f96da63bef33998f1747;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index bfe1e5087743..ab097ce77f0d 100644 --- 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 b22bb337c871..06b8d246502e 100644 --- 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 */