upstream: [media] media: davinci: vpif_capture: drop reserving memory for device
authorLad, Prabhakar <prabhakar.csengg@gmail.com>
Fri, 16 May 2014 13:33:43 +0000 (10:33 -0300)
committerChanho Park <chanho61.park@samsung.com>
Tue, 18 Nov 2014 02:59:31 +0000 (11:59 +0900)
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>
drivers/media/platform/davinci/vpif_capture.c

index 5599e56..a5b161d 100644 (file)
@@ -1545,7 +1545,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;
 
@@ -1598,23 +1597,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_CAPTURE_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;