Skip to content

Commit

Permalink
[media] radio-si4713: remove audout ioctls
Browse files Browse the repository at this point in the history
The audout ioctls are not appropriate for radio transmitters, they apply to
video output devices only. Remove them from this driver.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Eduardo Valentin <edubezval@gmail.com>
Tested-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Apr 14, 2013
1 parent 3de09fb commit 91e20e8
Showing 1 changed file with 0 additions and 32 deletions.
32 changes: 0 additions & 32 deletions drivers/media/radio/radio-si4713.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,35 +59,6 @@ static const struct v4l2_file_operations radio_si4713_fops = {
};

/* Video4Linux Interface */
static int radio_si4713_fill_audout(struct v4l2_audioout *vao)
{
/* TODO: check presence of audio output */
strlcpy(vao->name, "FM Modulator Audio Out", 32);

return 0;
}

static int radio_si4713_enumaudout(struct file *file, void *priv,
struct v4l2_audioout *vao)
{
return radio_si4713_fill_audout(vao);
}

static int radio_si4713_g_audout(struct file *file, void *priv,
struct v4l2_audioout *vao)
{
int rval = radio_si4713_fill_audout(vao);

vao->index = 0;

return rval;
}

static int radio_si4713_s_audout(struct file *file, void *priv,
const struct v4l2_audioout *vao)
{
return vao->index ? -EINVAL : 0;
}

/* radio_si4713_querycap - query device capabilities */
static int radio_si4713_querycap(struct file *file, void *priv,
Expand Down Expand Up @@ -229,9 +200,6 @@ static long radio_si4713_default(struct file *file, void *p,
}

static struct v4l2_ioctl_ops radio_si4713_ioctl_ops = {
.vidioc_enumaudout = radio_si4713_enumaudout,
.vidioc_g_audout = radio_si4713_g_audout,
.vidioc_s_audout = radio_si4713_s_audout,
.vidioc_querycap = radio_si4713_querycap,
.vidioc_queryctrl = radio_si4713_queryctrl,
.vidioc_g_ext_ctrls = radio_si4713_g_ext_ctrls,
Expand Down

0 comments on commit 91e20e8

Please sign in to comment.