upstream: [media] media: davinci: vpif_display: drop reserving memory for device

this patch drops reserving contigiuos memory for the device,
as now with CMA support there is no need of this.
This patch also prepares to removal of config_params.

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 f28f7c0..29fe6dd 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1338,7 +1338,6 @@ static __init int vpif_probe(struct platform_device *pdev)
        struct video_device *vfd;
        struct resource *res;
        int subdev_count;
-       size_t size;
 
        vpif_dev = &pdev->dev;
        err = initialize_vpif();
@@ -1395,23 +1394,6 @@ static __init int vpif_probe(struct platform_device *pdev)
                ch->video_dev = vfd;
        }
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res) {
-               size = resource_size(res);
-               /* The resources are divided into two equal memory and when
-                * we have HD output we can add them together
-                */
-               for (j = 0; j < VPIF_DISPLAY_MAX_DEVICES; j++) {
-                       ch = vpif_obj.dev[j];
-                       ch->channel_id = j;
-
-                       /* only enabled if second resource exists */
-                       config_params.video_limit[ch->channel_id] = 0;
-                       if (size)
-                               config_params.video_limit[ch->channel_id] =
-                                                                       size/2;
-               }
-       }
        vpif_obj.config = pdev->dev.platform_data;
        subdev_count = vpif_obj.config->subdev_count;
        subdevdata = vpif_obj.config->subdevinfo;