These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / usb / usbvision / usbvision.h

diff --git a/kernel/drivers/media/usb/usbvision/usbvision.h b/kernel/drivers/media/usb/usbvision/usbvision.h
index 140a1f6..4f2e4fd 100644 (file)
--- a/kernel/drivers/media/usb/usbvision/usbvision.h
+++ b/kernel/drivers/media/usb/usbvision/usbvision.h
@@ -36,6 +36,7 @@
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <media/v4l2-device.h>
+#include <media/v4l2-ctrls.h>
 #include <media/tuner.h>
 #include <linux/videodev2.h>
 
@@ -357,6 +358,7 @@ extern struct usb_device_id usbvision_table[];
 
 struct usb_usbvision {
        struct v4l2_device v4l2_dev;
+       struct v4l2_ctrl_handler hdl;
        struct video_device vdev;                                       /* Video Device */
        struct video_device rdev;                                       /* Radio Device */
 
@@ -376,7 +378,8 @@ struct usb_usbvision {
        int bridge_type;                                                /* NT1003, NT1004, NT1005 */
        int radio;
        int video_inputs;                                               /* # of inputs */
-       unsigned long freq;
+       unsigned long radio_freq;
+       unsigned long tv_freq;
        int audio_mute;
        int audio_channel;
        int isoc_mode;                                                  /* format of video data for the usb isoc-transfer */
@@ -391,8 +394,6 @@ struct usb_usbvision {
        unsigned char iface_alt;                                        /* Alt settings */
        unsigned char vin_reg2_preset;
        struct mutex v4l2_lock;
-       struct timer_list power_off_timer;
-       struct work_struct power_off_work;
        int power;                                                      /* is the device powered on? */
        int user;                                                       /* user count for exclusive use */
        int initialized;                                                /* Had we already sent init sequence? */
@@ -510,9 +511,6 @@ int usbvision_muxsel(struct usb_usbvision *usbvision, int channel);
 int usbvision_set_input(struct usb_usbvision *usbvision);
 int usbvision_set_output(struct usb_usbvision *usbvision, int width, int height);
 
-void usbvision_init_power_off_timer(struct usb_usbvision *usbvision);
-void usbvision_set_power_off_timer(struct usb_usbvision *usbvision);
-void usbvision_reset_power_off_timer(struct usb_usbvision *usbvision);
 int usbvision_power_off(struct usb_usbvision *usbvision);
 int usbvision_power_on(struct usb_usbvision *usbvision);