diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-20 11:59:35 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:34:46 -0500 |
commit | 7730bef9c5eaaecc3f441cd389ae189b17759117 (patch) | |
tree | 27f3c5a81a7ccade826112b5310adf6574e153af /drivers/media/video | |
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/video')
-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 e194949f8577..187e917f6659 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[] = { | |||
119 | .cxoformat = 0x181f0008, | 119 | .cxoformat = 0x181f0008, |
120 | } | 120 | } |
121 | }; | 121 | }; |
122 | int cx88_do_ioctl( struct inode *inode, struct file *file, | ||
123 | int radio, struct cx88_core *core, unsigned int cmd, | ||
124 | void *arg, v4l2_kioctl driver_ioctl ); | ||
125 | 122 | ||
126 | #define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024 | 123 | #define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024 |
127 | 124 | ||
@@ -1000,30 +997,6 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file, | |||
1000 | return cx8800_ctrl_query(qctrl); | 997 | return cx8800_ctrl_query(qctrl); |
1001 | } | 998 | } |
1002 | 999 | ||
1003 | default: | ||
1004 | return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, cx88_ioctl_hook); | ||
1005 | } | ||
1006 | return 0; | ||
1007 | } | ||
1008 | |||
1009 | int cx88_do_ioctl(struct inode *inode, struct file *file, int radio, | ||
1010 | struct cx88_core *core, unsigned int cmd, void *arg, v4l2_kioctl driver_ioctl) | ||
1011 | { | ||
1012 | int err; | ||
1013 | |||
1014 | if (debug) { | ||
1015 | if (debug > 1) { | ||
1016 | if (_IOC_DIR(cmd) & _IOC_WRITE) | ||
1017 | v4l_printk_ioctl_arg("cx88(w)",cmd, arg); | ||
1018 | else if (!_IOC_DIR(cmd) & _IOC_READ) { | ||
1019 | v4l_print_ioctl("cx88", cmd); | ||
1020 | } | ||
1021 | } else | ||
1022 | v4l_print_ioctl(core->name,cmd); | ||
1023 | |||
1024 | } | ||
1025 | |||
1026 | switch (cmd) { | ||
1027 | /* ------ input switching ---------- */ | 1000 | /* ------ input switching ---------- */ |
1028 | case VIDIOC_ENUMINPUT: | 1001 | case VIDIOC_ENUMINPUT: |
1029 | { | 1002 | { |