]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/media/video/em28xx/em28xx-video.c
V4L/DVB (7617): Removes a manual mode setup
[karo-tx-linux.git] / drivers / media / video / em28xx / em28xx-video.c
index 72a7633b6452c36182468065a749133c52a09c19..8996175cc95075bca9c42c89501a2adc51bd12fc 100644 (file)
@@ -1,5 +1,6 @@
 /*
-   em28xx-video.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+   em28xx-video.c - driver for Empia EM2800/EM2820/2840 USB
+                   video capture devices
 
    Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
                      Markus Rechberger <mrechberger@gmail.com>
@@ -58,10 +59,13 @@ static unsigned int isoc_debug;
 module_param(isoc_debug, int, 0644);
 MODULE_PARM_DESC(isoc_debug, "enable debug messages [isoc transfers]");
 
-#define em28xx_isocdbg(fmt, arg...) do {\
-       if (isoc_debug) \
+#define em28xx_isocdbg(fmt, arg...) \
+do {\
+       if (isoc_debug) { \
                printk(KERN_INFO "%s %s :"fmt, \
-                        dev->name, __func__ , ##arg); } while (0)
+                        dev->name, __func__ , ##arg); \
+       } \
+  } while (0)
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
@@ -84,8 +88,8 @@ MODULE_PARM_DESC(vbi_nr,   "vbi device numbers");
 MODULE_PARM_DESC(radio_nr, "radio device numbers");
 
 static unsigned int video_debug;
-module_param(video_debug,int,0644);
-MODULE_PARM_DESC(video_debug,"enable debug messages [video]");
+module_param(video_debug, int, 0644);
+MODULE_PARM_DESC(video_debug, "enable debug messages [video]");
 
 /* Bitmask marking allocated devices from 0 to EM28XX_MAXBOARDS */
 static unsigned long em28xx_devused;
@@ -102,7 +106,7 @@ static struct v4l2_queryctrl em28xx_qctrl[] = {
                .step = 0x1,
                .default_value = 0x1f,
                .flags = 0,
-       },{
+       }, {
                .id = V4L2_CID_AUDIO_MUTE,
                .type = V4L2_CTRL_TYPE_BOOLEAN,
                .name = "Mute",
@@ -285,11 +289,10 @@ static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
 /*
  * Controls the isoc copy of each urb packet
  */
-static inline int em28xx_isoc_copy(struct urb *urb)
+static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb)
 {
        struct em28xx_buffer    *buf;
        struct em28xx_dmaqueue  *dma_q = urb->context;
-       struct em28xx *dev = container_of(dma_q, struct em28xx, vidq);
        unsigned char *outp = NULL;
        int i, len = 0, rc = 1;
        unsigned char *p;
@@ -370,188 +373,6 @@ static inline int em28xx_isoc_copy(struct urb *urb)
        return rc;
 }
 
-/* ------------------------------------------------------------------
-       URB control
-   ------------------------------------------------------------------*/
-
-/*
- * IRQ callback, called by URB callback
- */
-static void em28xx_irq_callback(struct urb *urb)
-{
-       struct em28xx_dmaqueue  *dma_q = urb->context;
-       struct em28xx *dev = container_of(dma_q, struct em28xx, vidq);
-       int rc, i;
-
-       /* Copy data from URB */
-       spin_lock(&dev->slock);
-       rc = em28xx_isoc_copy(urb);
-       spin_unlock(&dev->slock);
-
-       /* Reset urb buffers */
-       for (i = 0; i < urb->number_of_packets; i++) {
-               urb->iso_frame_desc[i].status = 0;
-               urb->iso_frame_desc[i].actual_length = 0;
-       }
-       urb->status = 0;
-
-       urb->status = usb_submit_urb(urb, GFP_ATOMIC);
-       if (urb->status) {
-               em28xx_err("urb resubmit failed (error=%i)\n",
-                       urb->status);
-       }
-}
-
-/*
- * Stop and Deallocate URBs
- */
-static void em28xx_uninit_isoc(struct em28xx *dev)
-{
-       struct urb *urb;
-       int i;
-
-       em28xx_isocdbg("em28xx: called em28xx_uninit_isoc\n");
-
-       dev->isoc_ctl.nfields = -1;
-       for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
-               urb = dev->isoc_ctl.urb[i];
-               if (urb) {
-                       usb_kill_urb(urb);
-                       usb_unlink_urb(urb);
-                       if (dev->isoc_ctl.transfer_buffer[i]) {
-                               usb_buffer_free(dev->udev,
-                                               urb->transfer_buffer_length,
-                                               dev->isoc_ctl.transfer_buffer[i],
-                                               urb->transfer_dma);
-                       }
-                       usb_free_urb(urb);
-                       dev->isoc_ctl.urb[i] = NULL;
-               }
-               dev->isoc_ctl.transfer_buffer[i] = NULL;
-       }
-
-       kfree(dev->isoc_ctl.urb);
-       kfree(dev->isoc_ctl.transfer_buffer);
-       dev->isoc_ctl.urb = NULL;
-       dev->isoc_ctl.transfer_buffer = NULL;
-
-       dev->isoc_ctl.num_bufs = 0;
-
-       em28xx_capture_start(dev, 0);
-}
-
-/*
- * Allocate URBs and start IRQ
- */
-static int em28xx_prepare_isoc(struct em28xx *dev, int max_packets,
-                              int num_bufs)
-{
-       struct em28xx_dmaqueue *dma_q = &dev->vidq;
-       int i;
-       int sb_size, pipe;
-       struct urb *urb;
-       int j, k;
-
-       em28xx_isocdbg("em28xx: called em28xx_prepare_isoc\n");
-
-       /* De-allocates all pending stuff */
-       em28xx_uninit_isoc(dev);
-
-       dev->isoc_ctl.num_bufs = num_bufs;
-
-       dev->isoc_ctl.urb = kzalloc(sizeof(void *)*num_bufs,  GFP_KERNEL);
-       if (!dev->isoc_ctl.urb) {
-               em28xx_errdev("cannot alloc memory for usb buffers\n");
-               return -ENOMEM;
-       }
-
-       dev->isoc_ctl.transfer_buffer = kzalloc(sizeof(void *)*num_bufs,
-                                             GFP_KERNEL);
-       if (!dev->isoc_ctl.urb) {
-               em28xx_errdev("cannot allocate memory for usbtransfer\n");
-               kfree(dev->isoc_ctl.urb);
-               return -ENOMEM;
-       }
-
-       dev->isoc_ctl.max_pkt_size = dev->max_pkt_size;
-       dev->isoc_ctl.buf = NULL;
-
-       sb_size = max_packets * dev->isoc_ctl.max_pkt_size;
-
-       /* allocate urbs and transfer buffers */
-       for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
-               urb = usb_alloc_urb(max_packets, GFP_KERNEL);
-               if (!urb) {
-                       em28xx_err("cannot alloc isoc_ctl.urb %i\n", i);
-                       em28xx_uninit_isoc(dev);
-                       return -ENOMEM;
-               }
-               dev->isoc_ctl.urb[i] = urb;
-
-               dev->isoc_ctl.transfer_buffer[i] = usb_buffer_alloc(dev->udev,
-                       sb_size, GFP_KERNEL, &urb->transfer_dma);
-               if (!dev->isoc_ctl.transfer_buffer[i]) {
-                       em28xx_err("unable to allocate %i bytes for transfer"
-                                       " buffer %i%s\n",
-                                       sb_size, i,
-                                       in_interrupt()?" while in int":"");
-                       em28xx_uninit_isoc(dev);
-                       return -ENOMEM;
-               }
-               memset(dev->isoc_ctl.transfer_buffer[i], 0, sb_size);
-
-               /* FIXME: this is a hack - should be
-                       'desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK'
-                       should also be using 'desc.bInterval'
-                */
-               pipe = usb_rcvisocpipe(dev->udev, 0x82);
-               usb_fill_int_urb(urb, dev->udev, pipe,
-                                dev->isoc_ctl.transfer_buffer[i], sb_size,
-                                em28xx_irq_callback, dma_q, 1);
-
-               urb->number_of_packets = max_packets;
-               urb->transfer_flags = URB_ISO_ASAP;
-
-               k = 0;
-               for (j = 0; j < max_packets; j++) {
-                       urb->iso_frame_desc[j].offset = k;
-                       urb->iso_frame_desc[j].length =
-                                               dev->isoc_ctl.max_pkt_size;
-                       k += dev->isoc_ctl.max_pkt_size;
-               }
-       }
-
-       return 0;
-}
-
-static int em28xx_start_thread(struct em28xx_dmaqueue  *dma_q)
-{
-       struct em28xx *dev = container_of(dma_q, struct em28xx, vidq);
-       int i, rc = 0;
-
-       em28xx_videodbg("Called em28xx_start_thread\n");
-
-       init_waitqueue_head(&dma_q->wq);
-
-       em28xx_capture_start(dev, 1);
-
-       /* submit urbs and enables IRQ */
-       for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
-               rc = usb_submit_urb(dev->isoc_ctl.urb[i], GFP_ATOMIC);
-               if (rc) {
-                       em28xx_err("submit of urb %i failed (error=%i)\n", i,
-                                  rc);
-                       em28xx_uninit_isoc(dev);
-                       return rc;
-               }
-       }
-
-       if (rc < 0)
-               return rc;
-
-       return 0;
-}
-
 /* ------------------------------------------------------------------
        Videobuf operations
    ------------------------------------------------------------------*/
@@ -570,10 +391,8 @@ buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
        if (*count < EM28XX_MIN_BUF)
                *count = EM28XX_MIN_BUF;
 
-       dev->mode = EM28XX_ANALOG_MODE;
-
        /* Ask tuner to go to analog mode */
-       memset (&f, 0, sizeof(f));
+       memset(&f, 0, sizeof(f));
        f.frequency = dev->ctl_freq;
 
        em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, &f);
@@ -615,7 +434,6 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
        struct em28xx_fh     *fh  = vq->priv_data;
        struct em28xx_buffer *buf = container_of(vb, struct em28xx_buffer, vb);
        struct em28xx        *dev = fh->dev;
-       struct em28xx_dmaqueue *vidq = &dev->vidq;
        int                  rc = 0, urb_init = 0;
 
        /* FIXME: It assumes depth = 16 */
@@ -639,12 +457,9 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
                urb_init = 1;
 
        if (urb_init) {
-               rc = em28xx_prepare_isoc(dev, EM28XX_NUM_PACKETS,
-                                        EM28XX_NUM_BUFS);
-               if (rc < 0)
-                       goto fail;
-
-               rc = em28xx_start_thread(vidq);
+               rc = em28xx_init_isoc(dev, EM28XX_NUM_PACKETS,
+                                     EM28XX_NUM_BUFS, dev->max_pkt_size,
+                                     em28xx_isoc_copy);
                if (rc < 0)
                        goto fail;
        }
@@ -670,7 +485,8 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 
 }
 
-static void buffer_release(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+static void buffer_release(struct videobuf_queue *vq,
+                               struct videobuf_buffer *vb)
 {
        struct em28xx_buffer   *buf  = container_of(vb, struct em28xx_buffer, vb);
        struct em28xx_fh       *fh   = vq->priv_data;
@@ -688,7 +504,7 @@ static struct videobuf_queue_ops em28xx_video_qops = {
        .buf_release    = buffer_release,
 };
 
-/*********************  v4l2 interface  ******************************************/
+/*********************  v4l2 interface  **************************************/
 
 /*
  * em28xx_config()
@@ -703,9 +519,9 @@ static int em28xx_config(struct em28xx *dev)
 
        /* enable vbi capturing */
 
-/*     em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1); audio register */
-/*     em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1); clk register */
-       em28xx_write_regs_req(dev,0x00,0x11,"\x51",1);
+/*     em28xx_write_regs_req(dev, 0x00, 0x0e, "\xC0", 1); audio register */
+/*     em28xx_write_regs_req(dev, 0x00, 0x0f, "\x80", 1); clk register */
+       em28xx_write_regs_req(dev, 0x00, 0x11, "\x51", 1);
 
        dev->mute = 1;          /* maybe not the right place... */
        dev->volume = 0x1f;
@@ -744,12 +560,15 @@ static void video_mux(struct em28xx *dev, int index)
        em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
 
        if (dev->has_msp34xx) {
-               if (dev->i2s_speed)
-                       em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ, &dev->i2s_speed);
+               if (dev->i2s_speed) {
+                       em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ,
+                               &dev->i2s_speed);
+               }
                route.input = dev->ctl_ainput;
                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
                /* Note: this is msp3400 specific */
-               em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING, &route);
+               em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING,
+                       &route);
        }
 
        em28xx_audio_analog_set(dev);
@@ -989,7 +808,7 @@ out:
        return rc;
 }
 
-static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm)
+static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm)
 {
        struct em28xx_fh   *fh  = priv;
        struct em28xx      *dev = fh->dev;
@@ -1106,11 +925,11 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
 
        index = dev->ctl_ainput;
 
-       if (index == 0) {
+       if (index == 0)
                strcpy(a->name, "Television");
-       } else {
+       else
                strcpy(a->name, "Line In");
-       }
+
        a->capability = V4L2_AUDCAP_STEREO;
        a->index = index;
 
@@ -1321,9 +1140,9 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int em28xx_reg_len(int reg)
 {
        switch (reg) {
-       case AC97LSB_REG:
-       case HSCALELOW_REG:
-       case VSCALELOW_REG:
+       case EM28XX_R40_AC97LSB:
+       case EM28XX_R30_HSCALELOW:
+       case EM28XX_R32_VSCALELOW:
                return 2;
        default:
                return 1;
@@ -1688,7 +1507,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
 {
        int minor = iminor(inode);
        int errCode = 0, radio = 0;
-       struct em28xx *h,*dev = NULL;
+       struct em28xx *h, *dev = NULL;
        struct em28xx_fh *fh;
        enum v4l2_buf_type fh_type = 0;
 
@@ -1713,8 +1532,8 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
        em28xx_videodbg("open minor=%d type=%s users=%d\n",
                                minor, v4l2_type_names[fh_type], dev->users);
 
-       fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
 
+       fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
        if (!fh) {
                em28xx_errdev("em28xx-video.c: Out of memory?!\n");
                return -ENOMEM;
@@ -1731,9 +1550,15 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                dev->hscale = 0;
                dev->vscale = 0;
 
+               em28xx_set_mode(dev, EM28XX_ANALOG_MODE);
                em28xx_set_alternate(dev);
                em28xx_resolution_set(dev);
 
+               /* Needed, since GPIO might have disabled power of
+                  some i2c device
+                */
+               em28xx_config_i2c(dev);
+
        }
        if (fh->radio) {
                em28xx_videodbg("video_open: setting radio device\n");
@@ -1747,6 +1572,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                        sizeof(struct em28xx_buffer), fh);
 
        mutex_unlock(&dev->lock);
+
        return errCode;
 }
 
@@ -1789,12 +1615,13 @@ static void em28xx_release_resources(struct em28xx *dev)
        usb_put_dev(dev->udev);
 
        /* Mark device as unused */
-       em28xx_devused&=~(1<<dev->devno);
+       em28xx_devused &= ~(1<<dev->devno);
 }
 
 /*
  * em28xx_v4l2_close()
- * stops streaming and deallocates all resources allocated by the v4l2 calls and ioctls
+ * stops streaming and deallocates all resources allocated by the v4l2
+ * calls and ioctls
  */
 static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
 {
@@ -1825,6 +1652,7 @@ static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
 
                /* do this before setting alternate! */
                em28xx_uninit_isoc(dev);
+               em28xx_set_mode(dev, EM28XX_MODE_UNDEFINED);
 
                /* set alternate 0 */
                dev->alt = 0;
@@ -1847,7 +1675,7 @@ static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
  * will allocate buffers when called for the first time
  */
 static ssize_t
-em28xx_v4l2_read(struct file *filp, char __user * buf, size_t count,
+em28xx_v4l2_read(struct file *filp, char __user *buf, size_t count,
                 loff_t *pos)
 {
        struct em28xx_fh *fh = filp->private_data;
@@ -2012,7 +1840,7 @@ static struct video_device em28xx_radio_template = {
 #endif
 };
 
-/******************************** usb interface *****************************************/
+/******************************** usb interface ******************************/
 
 
 static LIST_HEAD(em28xx_extension_devlist);
@@ -2105,10 +1933,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
        dev->em28xx_read_reg_req = em28xx_read_reg_req;
        dev->is_em2800 = em28xx_boards[dev->model].is_em2800;
 
-       errCode = em28xx_read_reg(dev, CHIPID_REG);
-       if (errCode >= 0)
-               em28xx_info("em28xx chip ID = %d\n", errCode);
-
        em28xx_pre_card_setup(dev);
 
        errCode = em28xx_config(dev);
@@ -2275,22 +2099,24 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        ifnum = interface->altsetting[0].desc.bInterfaceNumber;
 
        /* Check to see next free device and mark as used */
-       nr=find_first_zero_bit(&em28xx_devused,EM28XX_MAXBOARDS);
-       em28xx_devused|=1<<nr;
+       nr = find_first_zero_bit(&em28xx_devused, EM28XX_MAXBOARDS);
+       em28xx_devused |= 1<<nr;
 
        /* Don't register audio interfaces */
        if (interface->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) {
                em28xx_err(DRIVER_NAME " audio device (%04x:%04x): interface %i, class %i\n",
-                               udev->descriptor.idVendor,udev->descriptor.idProduct,
+                               udev->descriptor.idVendor,
+                               udev->descriptor.idProduct,
                                ifnum,
                                interface->altsetting[0].desc.bInterfaceClass);
 
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENODEV;
        }
 
        em28xx_err(DRIVER_NAME " new video device (%04x:%04x): interface %i, class %i\n",
-                       udev->descriptor.idVendor,udev->descriptor.idProduct,
+                       udev->descriptor.idVendor,
+                       udev->descriptor.idProduct,
                        ifnum,
                        interface->altsetting[0].desc.bInterfaceClass);
 
@@ -2300,18 +2126,19 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
            USB_ENDPOINT_XFER_ISOC) {
                em28xx_err(DRIVER_NAME " probing error: endpoint is non-ISO endpoint!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENODEV;
        }
        if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) {
                em28xx_err(DRIVER_NAME " probing error: endpoint is ISO OUT endpoint!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENODEV;
        }
 
        if (nr >= EM28XX_MAXBOARDS) {
-               printk (DRIVER_NAME ": Supports only %i em28xx boards.\n",EM28XX_MAXBOARDS);
-               em28xx_devused&=~(1<<nr);
+               printk(DRIVER_NAME ": Supports only %i em28xx boards.\n",
+                               EM28XX_MAXBOARDS);
+               em28xx_devused &= ~(1<<nr);
                return -ENOMEM;
        }
 
@@ -2319,7 +2146,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (dev == NULL) {
                em28xx_err(DRIVER_NAME ": out of memory!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENOMEM;
        }
 
@@ -2343,14 +2170,14 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        /* compute alternate max packet sizes */
        uif = udev->actconfig->interface[0];
 
-       dev->num_alt=uif->num_altsetting;
-       em28xx_info("Alternate settings: %i\n",dev->num_alt);
-//     dev->alt_max_pkt_size = kmalloc(sizeof(*dev->alt_max_pkt_size)*
-       dev->alt_max_pkt_size = kmalloc(32*
-                                               dev->num_alt,GFP_KERNEL);
+       dev->num_alt = uif->num_altsetting;
+       em28xx_info("Alternate settings: %i\n", dev->num_alt);
+/*     dev->alt_max_pkt_size = kmalloc(sizeof(*dev->alt_max_pkt_size)* */
+       dev->alt_max_pkt_size = kmalloc(32 * dev->num_alt, GFP_KERNEL);
+
        if (dev->alt_max_pkt_size == NULL) {
                em28xx_errdev("out of memory!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                kfree(dev);
                return -ENOMEM;
        }
@@ -2360,11 +2187,11 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                                                        wMaxPacketSize);
                dev->alt_max_pkt_size[i] =
                    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-               em28xx_info("Alternate setting %i, max size= %i\n",i,
-                                                       dev->alt_max_pkt_size[i]);
+               em28xx_info("Alternate setting %i, max size= %i\n", i,
+                                               dev->alt_max_pkt_size[i]);
        }
 
-       if ((card[nr]>=0)&&(card[nr]<em28xx_bcount))
+       if ((card[nr] >= 0) && (card[nr] < em28xx_bcount))
                dev->model = card[nr];
 
        /* allocate device struct */
@@ -2377,11 +2204,6 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        /* save our data pointer in this interface device */
        usb_set_intfdata(interface, dev);
 
-#if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)
-       dev->qops = kmalloc(sizeof(em28xx_video_qops), GFP_KERNEL);
-       memcpy(dev->qops, &em28xx_video_qops, sizeof(em28xx_video_qops));
-#endif
-
        request_modules(dev);
 
        return 0;
@@ -2405,7 +2227,8 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
 
        em28xx_info("disconnecting %s\n", dev->vdev->name);
 
-       /* wait until all current v4l2 io is finished then deallocate resources */
+       /* wait until all current v4l2 io is finished then deallocate
+          resources */
        mutex_lock(&dev->lock);
 
        wake_up_interruptible_all(&dev->open);