diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-20 13:59:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 13:34:46 -0200 |
| commit | 7730bef9c5eaaecc3f441cd389ae189b17759117 (patch) | |
| tree | 27f3c5a81a7ccade826112b5310adf6574e153af /drivers/media | |
| parent | 84f1b6783a8f7057f3d7a5388c5f3f4a8bce7b0b (diff) | |
V4L/DVB (5108): Remove_cx88_ioctl
cx88_ioctl were merged at the master ioctl handler on cx88-blackbird
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index e194949f857..187e917f665 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c @@ -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: { |