diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-20 14:59:35 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-20 14:59:35 -0200 |
| commit | b206ad519d76ca074b086fd6d2b41b4cb5fe537d (patch) | |
| tree | 10df9488a94cf86161b00b91454e86673c6803b3 /linux/drivers/media | |
| parent | f7959bf29dfc8e63e668127cfcaa479ef26201c7 (diff) | |
| download | mediapointer-dvb-s2-b206ad519d76ca074b086fd6d2b41b4cb5fe537d.tar.gz mediapointer-dvb-s2-b206ad519d76ca074b086fd6d2b41b4cb5fe537d.tar.bz2 | |
Remove_cx88_ioctl
From: Mauro Carvalho Chehab <mchehab@infradead.org>
cx88_ioctl were merged at the master ioctl handler on cx88-blackbird
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index 5a79ec5d8..d4e286326 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -129,9 +129,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 @@ -1040,30 +1037,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: { |