Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 14:50:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

V4L/DVB (11381): ivtv/cx18: remove VIDIOC_INT_S_AUDIO_ROUTING debug support.

Browse Source 
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>
This commit is contained in:
Hans Verkuil 2009-04-02 11:37:41 -03:00 committed by Mauro Carvalho Chehab
parent 5325b4272a
commit 6c31e59836
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/cx18/cx18-ioctl.c
View File

@ -926,16 +926,6 @@ static long cx18_default(struct file *file, void *fh, int cmd, void *arg)
struct cx18 *cx = ((struct cx18_open_id *)fh)->cx; struct cx18 *cx = ((struct cx18_open_id *)fh)->cx;
switch (cmd) { switch (cmd) {
case VIDIOC_INT_S_AUDIO_ROUTING: {
struct v4l2_routing *route = arg;
CX18_DEBUG_IOCTL("VIDIOC_INT_S_AUDIO_ROUTING(%d, %d)\n",
route->input, route->output);
cx18_call_hw(cx, cx->card->hw_audio_ctrl, audio, s_routing,
route->input, route->output, 0);
break;
}
case VIDIOC_INT_RESET: { case VIDIOC_INT_RESET: {
u32 val = *(u32 *)arg; u32 val = *(u32 *)arg;

8
drivers/media/video/ivtv/ivtv-ioctl.c
View File

@ -1734,14 +1734,6 @@ static long ivtv_default(struct file *file, void *fh, int cmd, void *arg)
struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv; struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv;
switch (cmd) { switch (cmd) {
case VIDIOC_INT_S_AUDIO_ROUTING: {
struct v4l2_routing *route = arg;
ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing,
route->input, route->output, 0);
break;
}
case VIDIOC_INT_RESET: { case VIDIOC_INT_RESET: {
u32 val = *(u32 *)arg; u32 val = *(u32 *)arg;

14
include/media/v4l2-common.h
View File

@ -174,10 +174,10 @@ const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type);
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* Note: these remaining ioctls should be removed as well, but they are still /* Note: these remaining ioctls/structs should be removed as well, but they are
used in tuner-simple.c (TUNER_SET_CONFIG) and cx18/ivtv (RESET and still used in tuner-simple.c (TUNER_SET_CONFIG), cx18/ivtv (RESET) and
S_AUDIO_ROUTING). To remove these ioctls some more cleanup is needed in v4l2-int-device.h (v4l2_routing). To remove these ioctls some more cleanup
those modules. */ is needed in those modules. */
/* s_config */ /* s_config */
struct v4l2_priv_tun_config { struct v4l2_priv_tun_config {
@ -186,13 +186,11 @@ struct v4l2_priv_tun_config {
}; };
#define TUNER_SET_CONFIG _IOW('d', 92, struct v4l2_priv_tun_config) #define TUNER_SET_CONFIG _IOW('d', 92, struct v4l2_priv_tun_config)
/* s_routing: routing definition, device dependent. It specifies which inputs #define VIDIOC_INT_RESET _IOW ('d', 102, u32)
(if any) should be routed to which outputs (if any). */
struct v4l2_routing { struct v4l2_routing {
u32 input; u32 input;
u32 output; u32 output;
}; };
#define VIDIOC_INT_S_AUDIO_ROUTING _IOW ('d', 109, struct v4l2_routing)
#define VIDIOC_INT_RESET _IOW ('d', 102, u32)
#endif /* V4L2_COMMON_H_ */ #endif /* V4L2_COMMON_H_ */