]> err.no Git - linux-2.6/commitdiff
V4L/DVB (5108): Remove_cx88_ioctl
authorMauro Carvalho Chehab <mchehab@infradead.org>
Sat, 20 Jan 2007 16:59:35 +0000 (13:59 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 21 Feb 2007 15:34:46 +0000 (13:34 -0200)
cx88_ioctl were merged at the master ioctl handler on cx88-blackbird

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/cx88/cx88-blackbird.c

index e194949f857742ca83eaffdf2792ad28e7e253e6..187e917f66597aaf0766f24db7baf52215a6f670 100644 (file)
@@ -119,9 +119,6 @@ static struct cx88_tvnorm tvnorms[] = {
                .cxoformat = 0x181f0008,
        }
 };
-int cx88_do_ioctl( struct inode *inode, struct file *file,
-                  int radio, struct cx88_core *core, unsigned int cmd,
-                  void *arg, v4l2_kioctl driver_ioctl );
 
 #define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024
 
@@ -1000,30 +997,6 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
                return cx8800_ctrl_query(qctrl);
        }
 
-       default:
-               return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, cx88_ioctl_hook);
-       }
-       return 0;
-}
-
-int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
-                 struct cx88_core *core, unsigned int cmd, void *arg, v4l2_kioctl driver_ioctl)
-{
-       int err;
-
-       if (debug) {
-              if (debug > 1) {
-                      if (_IOC_DIR(cmd) & _IOC_WRITE)
-                              v4l_printk_ioctl_arg("cx88(w)",cmd, arg);
-                      else if (!_IOC_DIR(cmd) & _IOC_READ) {
-                              v4l_print_ioctl("cx88", cmd);
-                      }
-              } else
-                      v4l_print_ioctl(core->name,cmd);
-
-       }
-
-       switch (cmd) {
        /* ------ input switching ---------- */
        case VIDIOC_ENUMINPUT:
        {