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

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>

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 08fa567..320b009 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1221,13 +1221,11 @@ static int vpif_probe_complete(void)
                /* Initialize field of the channel objects */
                atomic_set(&ch->usrs, 0);
                for (k = 0; k < VPIF_NUMOBJECTS; k++) {
-                       ch->common[k].numbuffers = 0;
                        common = &ch->common[k];
                        common->io_usrs = 0;
                        common->started = 0;
                        spin_lock_init(&common->irqlock);
                        mutex_init(&common->lock);
-                       common->numbuffers = 0;
                        common->set_addr = NULL;
                        common->ytop_off = 0;
                        common->ybtm_off = 0;
@@ -1236,17 +1234,11 @@ static int vpif_probe_complete(void)
                        common->cur_frm = NULL;
                        common->next_frm = NULL;
                        memset(&common->fmt, 0, sizeof(common->fmt));
-                       common->numbuffers = config_params.numbuffers[k];
                }
                ch->initialized = 0;
                if (vpif_obj.config->subdev_count)
                        ch->sd = vpif_obj.sd[0];
                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));
 

diff --git a/drivers/media/platform/davinci/vpif_display.h b/drivers/media/platform/davinci/vpif_display.h
index 06b8d24..e21a343 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.h
+++ b/drivers/media/platform/davinci/vpif_display.h
@@ -67,7 +67,6 @@ struct vpif_disp_buffer {
 };
 
 struct common_obj {
-       u32 numbuffers;                         /* number of buffers */
        struct vpif_disp_buffer *cur_frm;       /* Pointer pointing to current
                                                 * vb2_buffer */
        struct vpif_disp_buffer *next_frm;      /* Pointer pointing to next