diff options
| author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2014-05-16 10:33:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 19:26:13 -0300 |
| commit | 7ec022466fe029601c1bab974795853a9ddd5f54 (patch) | |
| tree | cdf74dc5924e1133086b86874cf820f05d2f717b /drivers/media/platform | |
| parent | d9a3b13c3a77d2413a97cfe19f51b32ded612623 (diff) | |
| download | op-kernel-dev-7ec022466fe029601c1bab974795853a9ddd5f54.zip op-kernel-dev-7ec022466fe029601c1bab974795853a9ddd5f54.tar.gz | |
[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 <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/davinci/vpif_capture.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 75015f4..41cd3ff 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; |
