p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] usbvision: remove g/s_audio and for radio remove enum/g/s_input 

The g/s_audio ioctls didn't do anything, so remove them all for both
video and radio nodes and remove V4L2_CAP_AUDIO.

The enum/g/s_input ioctls are invalid for radio nodes, so remove them
from the radio ioctl_ops.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-07-20 09:59:31 -03:00 committed by Mauro Carvalho Chehab
parent 2b43665ffb
commit 601ecab34b
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/media/usb/usbvision/usbvision-video.c
View File

@ -494,7 +494,6 @@ static int vidioc_querycap(struct file *file, void *priv,
sizeof(vc->card)); sizeof(vc->card));
usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info)); usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info));
vc->device_caps = V4L2_CAP_VIDEO_CAPTURE | vc->device_caps = V4L2_CAP_VIDEO_CAPTURE |
V4L2_CAP_AUDIO |
V4L2_CAP_READWRITE | V4L2_CAP_READWRITE |
V4L2_CAP_STREAMING | V4L2_CAP_STREAMING |
(usbvision->have_tuner ? V4L2_CAP_TUNER : 0); (usbvision->have_tuner ? V4L2_CAP_TUNER : 0);
@ -524,7 +523,6 @@ static int vidioc_enum_input(struct file *file, void *priv,
} else { } else {
strcpy(vi->name, "Television"); strcpy(vi->name, "Television");
vi->type = V4L2_INPUT_TYPE_TUNER; vi->type = V4L2_INPUT_TYPE_TUNER;
vi->audioset = 1;
vi->tuner = chan; vi->tuner = chan;
vi->std = USBVISION_NORMS; vi->std = USBVISION_NORMS;
} }
@ -661,26 +659,6 @@ static int vidioc_s_frequency(struct file *file, void *priv,
return 0; return 0;
} }
static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
{
struct usb_usbvision *usbvision = video_drvdata(file);
if (usbvision->radio)
strcpy(a->name, "Radio");
else
strcpy(a->name, "TV");
return 0;
}
static int vidioc_s_audio(struct file *file, void *fh,
const struct v4l2_audio *a)
{
if (a->index)
return -EINVAL;
return 0;
}
static int vidioc_reqbufs(struct file *file, static int vidioc_reqbufs(struct file *file,
void *priv, struct v4l2_requestbuffers *vr) void *priv, struct v4l2_requestbuffers *vr)
{ {
@ -1204,8 +1182,6 @@ static const struct v4l2_ioctl_ops usbvision_ioctl_ops = {
.vidioc_enum_input = vidioc_enum_input, .vidioc_enum_input = vidioc_enum_input,
.vidioc_g_input = vidioc_g_input, .vidioc_g_input = vidioc_g_input,
.vidioc_s_input = vidioc_s_input, .vidioc_s_input = vidioc_s_input,
.vidioc_g_audio = vidioc_g_audio,
.vidioc_s_audio = vidioc_s_audio,
.vidioc_streamon = vidioc_streamon, .vidioc_streamon = vidioc_streamon,
.vidioc_streamoff = vidioc_streamoff, .vidioc_streamoff = vidioc_streamoff,
.vidioc_g_tuner = vidioc_g_tuner, .vidioc_g_tuner = vidioc_g_tuner,
@ -1241,11 +1217,6 @@ static const struct v4l2_file_operations usbvision_radio_fops = {
static const struct v4l2_ioctl_ops usbvision_radio_ioctl_ops = { static const struct v4l2_ioctl_ops usbvision_radio_ioctl_ops = {
.vidioc_querycap = vidioc_querycap, .vidioc_querycap = vidioc_querycap,
.vidioc_enum_input = vidioc_enum_input,
.vidioc_g_input = vidioc_g_input,
.vidioc_s_input = vidioc_s_input,
.vidioc_g_audio = vidioc_g_audio,
.vidioc_s_audio = vidioc_s_audio,
.vidioc_g_tuner = vidioc_g_tuner, .vidioc_g_tuner = vidioc_g_tuner,
.vidioc_s_tuner = vidioc_s_tuner, .vidioc_s_tuner = vidioc_s_tuner,
.vidioc_g_frequency = vidioc_g_frequency, .vidioc_g_frequency = vidioc_g_frequency,