Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c31e598 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5325b427

drivers/media/video/cx18/cx18-ioctl.c

+0 −10
Original line number Diff line number Diff line
@@ -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;



	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: {

		u32 val = *(u32 *)arg;

drivers/media/video/ivtv/ivtv-ioctl.c

+0 −8
Original line number Diff line number Diff line
@@ -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;



	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: {

		u32 val = *(u32 *)arg;

include/media/v4l2-common.h

+6 −8
Original line number Diff line number Diff line
@@ -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

   used in tuner-simple.c (TUNER_SET_CONFIG) and cx18/ivtv (RESET and

   S_AUDIO_ROUTING). To remove these ioctls some more cleanup is needed in

   those modules. */

/* Note: these remaining ioctls/structs should be removed as well, but they are

   still used in tuner-simple.c (TUNER_SET_CONFIG), cx18/ivtv (RESET) and

   v4l2-int-device.h (v4l2_routing). To remove these ioctls some more cleanup

   is needed in those modules. */



/* s_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)



/* s_routing: routing definition, device dependent. It specifies which inputs

   (if any) should be routed to which outputs (if any). */

#define VIDIOC_INT_RESET            	_IOW ('d', 102, u32)



struct v4l2_routing {

	u32 input;

	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_ */