]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] media: blackfin: bfin_capture: drop bcap_get_unmapped_area()
authorLad, Prabhakar <prabhakar.csengg@gmail.com>
Sun, 8 Mar 2015 14:40:52 +0000 (11:40 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 2 Apr 2015 21:11:49 +0000 (18:11 -0300)
this patch drops bcap_get_unmapped_area() and uses
vb2_fop_get_unmapped_area() helper provided by the vb2 core.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/blackfin/bfin_capture.c

index 306798eac666a8dec177d28ddbc025e163e2c9f7..d390f7c0152d1caa86368ddd306a7c7302c46460 100644 (file)
@@ -196,23 +196,6 @@ static void bcap_free_sensor_formats(struct bcap_device *bcap_dev)
        bcap_dev->sensor_formats = NULL;
 }
 
-#ifndef CONFIG_MMU
-static unsigned long bcap_get_unmapped_area(struct file *file,
-                                           unsigned long addr,
-                                           unsigned long len,
-                                           unsigned long pgoff,
-                                           unsigned long flags)
-{
-       struct bcap_device *bcap_dev = video_drvdata(file);
-
-       return vb2_get_unmapped_area(&bcap_dev->buffer_queue,
-                                    addr,
-                                    len,
-                                    pgoff,
-                                    flags);
-}
-#endif
-
 static int bcap_queue_setup(struct vb2_queue *vq,
                                const struct v4l2_format *fmt,
                                unsigned int *nbuffers, unsigned int *nplanes,
@@ -783,7 +766,7 @@ static struct v4l2_file_operations bcap_fops = {
        .unlocked_ioctl = video_ioctl2,
        .mmap = vb2_fop_mmap,
 #ifndef CONFIG_MMU
-       .get_unmapped_area = bcap_get_unmapped_area,
+       .get_unmapped_area = vb2_fop_get_unmapped_area,
 #endif
        .poll = vb2_fop_poll
 };