aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-04-02 10:37:41 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:28 -0400
commit6c31e598368bfff49fc3e694c5b7624635871acb (patch)
treec002301857834622e14faedd5dc3cb3cd8ab4f32 /drivers/media/video
parent5325b4272a53b43f55b82cc369c310c2fcacdca1 (diff)
V4L/DVB (11381): ivtv/cx18: remove VIDIOC_INT_S_AUDIO_ROUTING debug support.
Remove support for the debug call VIDIOC_INT_S_AUDIO_ROUTING from cx18 and ivtv. These internal ioctls shouldn't be exposed. These were only used through the cx18-ctl and ivtv-ctl utilities, and only when testing a new card variant. This cleanup allows the removal of this ioctl from v4l2-common.h. Cc: Andy Walls <awalls@radix.net> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx18/cx18-ioctl.c10
-rw-r--r--drivers/media/video/ivtv/ivtv-ioctl.c8
2 files changed, 0 insertions, 18 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index cdefd90d5eca..d7b1921e6666 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -926,16 +926,6 @@ static long cx18_default(struct file *file, void *fh, int cmd, void *arg)
926 struct cx18 *cx = ((struct cx18_open_id *)fh)->cx; 926 struct cx18 *cx = ((struct cx18_open_id *)fh)->cx;
927 927
928 switch (cmd) { 928 switch (cmd) {
929 case VIDIOC_INT_S_AUDIO_ROUTING: {
930 struct v4l2_routing *route = arg;
931
932 CX18_DEBUG_IOCTL("VIDIOC_INT_S_AUDIO_ROUTING(%d, %d)\n",
933 route->input, route->output);
934 cx18_call_hw(cx, cx->card->hw_audio_ctrl, audio, s_routing,
935 route->input, route->output, 0);
936 break;
937 }
938
939 case VIDIOC_INT_RESET: { 929 case VIDIOC_INT_RESET: {
940 u32 val = *(u32 *)arg; 930 u32 val = *(u32 *)arg;
941 931
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index cf48b6ab97cb..4a2d464f055e 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1734,14 +1734,6 @@ static long ivtv_default(struct file *file, void *fh, int cmd, void *arg)
1734 struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv; 1734 struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv;
1735 1735
1736 switch (cmd) { 1736 switch (cmd) {
1737 case VIDIOC_INT_S_AUDIO_ROUTING: {
1738 struct v4l2_routing *route = arg;
1739
1740 ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing,
1741 route->input, route->output, 0);
1742 break;
1743 }
1744
1745 case VIDIOC_INT_RESET: { 1737 case VIDIOC_INT_RESET: {
1746 u32 val = *(u32 *)arg; 1738 u32 val = *(u32 *)arg;
1747 1739