Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (3588): Remove VIDIOC_G/S_AUDOUT from msp3400

Browse Source 
VIDIOC_G/S_AUDOUT does not belong in msp3400 (it's a user level command,
not to be used in internal i2c drivers). Also fix a compile warning and
improve LOG_STATUS.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2006-03-20 16:32:52 -03:00 committed by Mauro Carvalho Chehab
parent c68735180c
commit e3bb834203
1 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/media/video/msp3400-driver.c
View File

@ -684,7 +684,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
struct v4l2_routing *rt = arg;
int tuner = (rt->input >> 3) & 1;
int old_tuner = (state->routing.input >> 3) & 1;
int sc_in = rt->input & 0x7;
int sc1_out = rt->output & 0xf;
int sc2_out = (rt->output >> 4) & 0xf;
@ -733,42 +732,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
break;
}
case VIDIOC_G_AUDOUT:
{
struct v4l2_audioout *a = (struct v4l2_audioout *)arg;
int idx = a->index;
memset(a, 0, sizeof(*a));
switch (idx) {
case 0:
strcpy(a->name, "Scart1 Out");
break;
case 1:
strcpy(a->name, "Scart2 Out");
break;
case 2:
strcpy(a->name, "I2S Out");
break;
default:
return -EINVAL;
}
break;
}
case VIDIOC_S_AUDOUT:
{
struct v4l2_audioout *a = (struct v4l2_audioout *)arg;
if (a->index < 0 || a->index > 2)
return -EINVAL;
v4l_dbg(1, msp_debug, client, "Setting audio out on msp34xx to input %i\n", a->index);
msp_set_scart(client, state->in_scart, a->index + 1);
break;
}
case VIDIOC_INT_I2S_CLOCK_FREQ:
{
u32 *a = (u32 *)arg;
@ -854,6 +817,8 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
(state->rxsubchans & V4L2_TUNER_SUB_LANG2) ? ", dual" : "");
}
v4l_info(client, "Audmode: 0x%04x\n", state->audmode);
v4l_info(client, "Routing: 0x%08x (input) 0x%08x (output)\n",
state->routing.input, state->routing.output);
v4l_info(client, "ACB: 0x%04x\n", state->acb);
break;
}