[media] media: davinci: vpbe: use vb2_fop_mmap/poll

this patch teaches vpbe driver to use vb2_fop_mmap/poll helpers.

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>

diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 524e1fd53ada9b4c01776513d69ce06b4ec3fadf..fc3bdb6afafed15180d8a54f6b6cd8a623197406 100644 (file)
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -1340,45 +1340,6 @@ static int vpbe_display_reqbufs(struct file *file, void *priv,
        return vb2_reqbufs(&layer->buffer_queue, req_buf);
 }
 
-/*
- * vpbe_display_mmap()
- * It is used to map kernel space buffers into user spaces
- */
-static int vpbe_display_mmap(struct file *filep, struct vm_area_struct *vma)
-{
-       /* Get the layer object and file handle object */
-       struct vpbe_fh *fh = filep->private_data;
-       struct vpbe_layer *layer = fh->layer;
-       struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-       int ret;
-
-       v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "vpbe_display_mmap\n");
-
-       if (mutex_lock_interruptible(&layer->opslock))
-               return -ERESTARTSYS;
-       ret = vb2_mmap(&layer->buffer_queue, vma);
-       mutex_unlock(&layer->opslock);
-       return ret;
-}
-
-/* vpbe_display_poll(): It is used for select/poll system call
- */
-static unsigned int vpbe_display_poll(struct file *filep, poll_table *wait)
-{
-       struct vpbe_fh *fh = filep->private_data;
-       struct vpbe_layer *layer = fh->layer;
-       struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-       unsigned int err = 0;
-
-       v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "vpbe_display_poll\n");
-       if (layer->started) {
-               mutex_lock(&layer->opslock);
-               err = vb2_poll(&layer->buffer_queue, filep, wait);
-               mutex_unlock(&layer->opslock);
-       }
-       return err;
-}
-
 /*
  * vpbe_display_open()
  * It creates object of file handle structure and stores it in private_data
@@ -1527,8 +1488,8 @@ static struct v4l2_file_operations vpbe_fops = {
        .open = vpbe_display_open,
        .release = vpbe_display_release,
        .unlocked_ioctl = video_ioctl2,
-       .mmap = vpbe_display_mmap,
-       .poll = vpbe_display_poll
+       .mmap = vb2_fop_mmap,
+       .poll =  vb2_fop_poll,
 };
 
 static int vpbe_device_get(struct device *dev, void *data)
@@ -1608,6 +1569,7 @@ static int register_device(struct vpbe_layer *vpbe_display_layer,
                  (int)vpbe_display_layer,
                  (int)&vpbe_display_layer->video_dev);
 
+       vpbe_display_layer->video_dev.queue = &vpbe_display_layer->buffer_queue;
        err = video_register_device(&vpbe_display_layer->video_dev,
                                    VFL_TYPE_GRABBER,
                                    -1);