[media] gscpa: Use v4l2_fh and add G/S_PRIORITY support

In order to support control event gspca has to use struct v4l2_fh.
As a bonus feature this also gives priority handling for free.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index dbebed90bbac76755019edc74fdbde5297d7a255..ed33a8773f7ed2f8d98b4feaefb84ba54dde2b82 100644 (file)
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -39,6 +39,7 @@
 #include <linux/ktime.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
+#include <media/v4l2-fh.h>
 
 #include "gspca.h"
 
@@ -1327,6 +1328,7 @@ static void gspca_release(struct video_device *vfd)
                video_device_node_name(&gspca_dev->vdev));
 
        v4l2_ctrl_handler_free(gspca_dev->vdev.ctrl_handler);
+       v4l2_device_unregister(&gspca_dev->v4l2_dev);
        kfree(gspca_dev->usb_buf);
        kfree(gspca_dev);
 }
@@ -1352,7 +1354,7 @@ static int dev_open(struct file *file)
                gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL
                                        | V4L2_DEBUG_IOCTL_ARG);
 #endif
-       return 0;
+       return v4l2_fh_open(file);
 }
 
 static int dev_close(struct file *file)
@@ -1378,7 +1380,7 @@ static int dev_close(struct file *file)
 
        PDEBUG(D_STREAM, "close done");
 
-       return 0;
+       return v4l2_fh_release(file);
 }
 
 static int vidioc_querycap(struct file *file, void  *priv,
@@ -2345,12 +2347,16 @@ int gspca_dev_probe2(struct usb_interface *intf,
                }
        }
 
+       ret = v4l2_device_register(&intf->dev, &gspca_dev->v4l2_dev);
+       if (ret)
+               goto out;
        gspca_dev->sd_desc = sd_desc;
        gspca_dev->nbufread = 2;
        gspca_dev->empty_packet = -1;   /* don't check the empty packets */
        gspca_dev->vdev = gspca_template;
-       gspca_dev->vdev.parent = &intf->dev;
+       gspca_dev->vdev.v4l2_dev = &gspca_dev->v4l2_dev;
        video_set_drvdata(&gspca_dev->vdev, gspca_dev);
+       set_bit(V4L2_FL_USE_FH_PRIO, &gspca_dev->vdev.flags);
        gspca_dev->module = module;
        gspca_dev->present = 1;
 
@@ -2462,6 +2468,7 @@ void gspca_disconnect(struct usb_interface *intf)
 
        /* the device is freed at exit of this function */
        gspca_dev->dev = NULL;
+       v4l2_device_disconnect(&gspca_dev->v4l2_dev);
        mutex_unlock(&gspca_dev->usb_lock);
 
        usb_set_intfdata(intf, NULL);

diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 81404160ca43f8f49940d5cf34fc83bbef63efd3..c1ebf7cd45b3734e299c2ac171fc9eec3e045b00 100644 (file)
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -6,6 +6,7 @@
 #include <linux/usb.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-device.h>
 #include <linux/mutex.h>
 
 /* compilation option */
@@ -159,6 +160,7 @@ struct gspca_frame {
 struct gspca_dev {
        struct video_device vdev;       /* !! must be the first item */
        struct module *module;          /* subdriver handling the device */
+       struct v4l2_device v4l2_dev;
        struct usb_device *dev;
        struct file *capt_file;         /* file doing video capture */
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)