evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] media: davinci: vpif_display: drop numbuffers field from common_obj

Browse source 
This patch drops numbuffers member from struct common_obj
as this was not required.

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>
This commit is contained in:
Lad, Prabhakar 2014-05-16 10:33:20 -03:00 • committed by Mauro Carvalho Chehab
parent f7cfbbbb02
commit cc575c22f0
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/platform/davinci/vpif_display.c
View file

@ -1221,13 +1221,11 @@ static int vpif_probe_complete(void)
/* Initialize field of the channel objects */ /* Initialize field of the channel objects */
atomic_set(&ch->usrs, 0); atomic_set(&ch->usrs, 0);
for (k = 0; k < VPIF_NUMOBJECTS; k++) { for (k = 0; k < VPIF_NUMOBJECTS; k++) {
ch->common[k].numbuffers = 0;
common = &ch->common[k]; common = &ch->common[k];
common->io_usrs = 0; common->io_usrs = 0;
common->started = 0; common->started = 0;
spin_lock_init(&common->irqlock); spin_lock_init(&common->irqlock);
mutex_init(&common->lock); mutex_init(&common->lock);
common->numbuffers = 0;
common->set_addr = NULL; common->set_addr = NULL;
common->ytop_off = 0; common->ytop_off = 0;
common->ybtm_off = 0; common->ybtm_off = 0;
@ -1236,17 +1234,11 @@ static int vpif_probe_complete(void)
common->cur_frm = NULL; common->cur_frm = NULL;
common->next_frm = NULL; common->next_frm = NULL;
memset(&common->fmt, 0, sizeof(common->fmt)); memset(&common->fmt, 0, sizeof(common->fmt));
common->numbuffers = config_params.numbuffers[k];
} }
ch->initialized = 0; ch->initialized = 0;
if (vpif_obj.config->subdev_count) if (vpif_obj.config->subdev_count)
ch->sd = vpif_obj.sd[0]; ch->sd = vpif_obj.sd[0];
ch->channel_id = j; ch->channel_id = j;
if (j < 2)
ch->common[VPIF_VIDEO_INDEX].numbuffers =
config_params.numbuffers[ch->channel_id];
else
ch->common[VPIF_VIDEO_INDEX].numbuffers = 0;
memset(&ch->vpifparams, 0, sizeof(ch->vpifparams)); memset(&ch->vpifparams, 0, sizeof(ch->vpifparams));

1
drivers/media/platform/davinci/vpif_display.h
View file

@ -67,7 +67,6 @@ struct vpif_disp_buffer {
}; };
struct common_obj { struct common_obj {
u32 numbuffers; /* number of buffers */
struct vpif_disp_buffer *cur_frm; /* Pointer pointing to current struct vpif_disp_buffer *cur_frm; /* Pointer pointing to current
* vb2_buffer */ * vb2_buffer */
struct vpif_disp_buffer *next_frm; /* Pointer pointing to next struct vpif_disp_buffer *next_frm; /* Pointer pointing to next