- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / media / video / usbvision / usbvision-video.c

diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 7c17ec6..c2690df 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -137,8 +137,6 @@ static int PowerOnAtOpen = 1;
 static int video_nr = -1;
 /* Sequential Number of Radio Device */
 static int radio_nr = -1;
-/* Sequential Number of VBI Device */
-static int vbi_nr = -1;
 
 /* Grab parameters for the device driver */
 
@@ -148,14 +146,12 @@ module_param(video_debug, int, 0444);
 module_param(PowerOnAtOpen, int, 0444);
 module_param(video_nr, int, 0444);
 module_param(radio_nr, int, 0444);
-module_param(vbi_nr, int, 0444);
 
 MODULE_PARM_DESC(isocMode, " Set the default format for ISOC endpoint.  Default: 0x60 (Compression On)");
 MODULE_PARM_DESC(video_debug, " Set the default Debug Mode of the device driver.  Default: 0 (Off)");
 MODULE_PARM_DESC(PowerOnAtOpen, " Set the default device to power on when device is opened.  Default: 1 (On)");
 MODULE_PARM_DESC(video_nr, "Set video device number (/dev/videoX).  Default: -1 (autodetect)");
 MODULE_PARM_DESC(radio_nr, "Set radio device number (/dev/radioX).  Default: -1 (autodetect)");
-MODULE_PARM_DESC(vbi_nr, "Set vbi device number (/dev/vbiX).  Default: -1 (autodetect)");
 
 
 // Misc stuff
@@ -1244,36 +1240,6 @@ static int usbvision_radio_close(struct file *file)
        return errCode;
 }
 
-/*
- * Here comes the stuff for vbi on usbvision based devices
- *
- */
-static int usbvision_vbi_open(struct file *file)
-{
-       /* TODO */
-       return -ENODEV;
-}
-
-static int usbvision_vbi_close(struct file *file)
-{
-       /* TODO */
-       return -ENODEV;
-}
-
-static long usbvision_do_vbi_ioctl(struct file *file,
-                                unsigned int cmd, void *arg)
-{
-       /* TODO */
-       return -ENOIOCTLCMD;
-}
-
-static long usbvision_vbi_ioctl(struct file *file,
-                      unsigned int cmd, unsigned long arg)
-{
-       return video_usercopy(file, cmd, arg, usbvision_do_vbi_ioctl);
-}
-
-
 //
 // Video registration stuff
 //
@@ -1367,21 +1333,6 @@ static struct video_device usbvision_radio_template = {
        .current_norm         = V4L2_STD_PAL
 };
 
-// vbi template
-static const struct v4l2_file_operations usbvision_vbi_fops = {
-       .owner             = THIS_MODULE,
-       .open           = usbvision_vbi_open,
-       .release        = usbvision_vbi_close,
-       .ioctl          = usbvision_vbi_ioctl,
-};
-
-static struct video_device usbvision_vbi_template=
-{
-       .fops           = &usbvision_vbi_fops,
-       .release        = video_device_release,
-       .name           = "usbvision-vbi",
-};
-
 
 static struct video_device *usbvision_vdev_init(struct usb_usbvision *usbvision,
                                        struct video_device *vdev_template,
@@ -1410,18 +1361,6 @@ static struct video_device *usbvision_vdev_init(struct usb_usbvision *usbvision,
 // unregister video4linux devices
 static void usbvision_unregister_video(struct usb_usbvision *usbvision)
 {
-       // vbi Device:
-       if (usbvision->vbi) {
-               PDEBUG(DBG_PROBE, "unregister %s [v4l2]",
-                      video_device_node_name(usbvision->vbi));
-               if (video_is_registered(usbvision->vbi)) {
-                       video_unregister_device(usbvision->vbi);
-               } else {
-                       video_device_release(usbvision->vbi);
-               }
-               usbvision->vbi = NULL;
-       }
-
        // Radio Device:
        if (usbvision->rdev) {
                PDEBUG(DBG_PROBE, "unregister %s [v4l2]",
@@ -1482,22 +1421,6 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
                printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device %s [v4l2]\n",
                       usbvision->nr, video_device_node_name(usbvision->rdev));
        }
-       // vbi Device:
-       if (usbvision_device_data[usbvision->DevModel].vbi) {
-               usbvision->vbi = usbvision_vdev_init(usbvision,
-                                                    &usbvision_vbi_template,
-                                                    "USBVision VBI");
-               if (usbvision->vbi == NULL) {
-                       goto err_exit;
-               }
-               if (video_register_device(usbvision->vbi,
-                                         VFL_TYPE_VBI,
-                                         vbi_nr)<0) {
-                       goto err_exit;
-               }
-               printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device %s [v4l2] (Not Working Yet!)\n",
-                      usbvision->nr, video_device_node_name(usbvision->vbi));
-       }
        // all done
        return 0;
 
@@ -1726,8 +1649,6 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
        usbvision_configure_video(usbvision);
        mutex_unlock(&usbvision->lock);
 
-
-       usb_set_intfdata (intf, usbvision);
        usbvision_create_sysfs(usbvision->vdev);
 
        PDEBUG(DBG_PROBE, "success");
@@ -1745,16 +1666,14 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
  */
 static void __devexit usbvision_disconnect(struct usb_interface *intf)
 {
-       struct usb_usbvision *usbvision = usb_get_intfdata(intf);
+       struct usb_usbvision *usbvision = to_usbvision(usb_get_intfdata(intf));
 
        PDEBUG(DBG_PROBE, "");
 
        if (usbvision == NULL) {
-               dev_err(&usbvision->dev->dev,
-                       "%s: usb_get_intfdata() failed\n", __func__);
+               pr_err("%s: usb_get_intfdata() failed\n", __func__);
                return;
        }
-       usb_set_intfdata (intf, NULL);
 
        mutex_lock(&usbvision->lock);