From: Lad, Prabhakar Date: Fri, 16 May 2014 13:33:43 +0000 (-0300) Subject: [media] media: davinci: vpif_capture: drop reserving memory for device X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9978^2~78 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7ec022466fe029601c1bab974795853a9ddd5f54;p=mirror_ubuntu-artful-kernel.git [media] media: davinci: vpif_capture: 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 75015f42c2da..41cd3fffa485 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -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;