Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (6740): tlv320aic23b: codingstyle cleanups

Browse source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2007-11-01 07:58:17 -03:00 committed by Mauro Carvalho Chehab
parent 4c05de9c97
commit 574dec611f
1 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
drivers/media/video/tlv320aic23b.c
View file

@ -57,37 +57,35 @@ static int tlv320aic23b_write(struct i2c_client *client, int reg, u16 val)
return -1; return -1;
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++)
if (i2c_smbus_write_byte_data(client, (reg << 1) | if (i2c_smbus_write_byte_data(client,
(val >> 8), val & 0xff) == 0) { (reg << 1) | (val >> 8), val & 0xff) == 0)
return 0; return 0;
}
}
v4l_err(client, "I2C: cannot write %03x to register R%d\n", val, reg); v4l_err(client, "I2C: cannot write %03x to register R%d\n", val, reg);
return -1; return -1;
} }
static int tlv320aic23b_command(struct i2c_client *client, unsigned int cmd, static int tlv320aic23b_command(struct i2c_client *client,
void *arg) unsigned int cmd, void *arg)
{ {
struct tlv320aic23b_state *state = i2c_get_clientdata(client); struct tlv320aic23b_state *state = i2c_get_clientdata(client);
struct v4l2_control *ctrl = arg; struct v4l2_control *ctrl = arg;
u32* freq = arg; u32 *freq = arg;
switch (cmd) { switch (cmd) {
case VIDIOC_INT_AUDIO_CLOCK_FREQ: case VIDIOC_INT_AUDIO_CLOCK_FREQ:
switch (*freq) { switch (*freq) {
case 32000: /* set sample rate to 32 kHz */ case 32000: /* set sample rate to 32 kHz */
tlv320aic23b_write(client, 8, 0x018); tlv320aic23b_write(client, 8, 0x018);
break; break;
case 44100: /* set sample rate to 44.1 kHz */ case 44100: /* set sample rate to 44.1 kHz */
tlv320aic23b_write(client, 8, 0x022); tlv320aic23b_write(client, 8, 0x022);
break; break;
case 48000: /* set sample rate to 48 kHz */ case 48000: /* set sample rate to 48 kHz */
tlv320aic23b_write(client, 8, 0x000); tlv320aic23b_write(client, 8, 0x000);
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
break; break;
@ -135,22 +133,29 @@ static int tlv320aic23b_probe(struct i2c_client *client)
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -EIO; return -EIO;
v4l_info(client, "chip found @ 0x%x (%s)\n", client->addr << 1, client->adapter->name); v4l_info(client, "chip found @ 0x%x (%s)\n",
client->addr << 1, client->adapter->name);
state = kmalloc(sizeof(struct tlv320aic23b_state), GFP_KERNEL); state = kmalloc(sizeof(struct tlv320aic23b_state), GFP_KERNEL);
if (state == NULL) { if (state == NULL)
return -ENOMEM; return -ENOMEM;
}
state->muted = 0; state->muted = 0;
i2c_set_clientdata(client, state); i2c_set_clientdata(client, state);
/* initialize tlv320aic23b */ /* Initialize tlv320aic23b */
tlv320aic23b_write(client, 15, 0x000); /* RESET */
tlv320aic23b_write(client, 6, 0x00A); /* turn off DAC & mic input */ /* RESET */
tlv320aic23b_write(client, 7, 0x049); /* left-justified, 24-bit, master mode */ tlv320aic23b_write(client, 15, 0x000);
tlv320aic23b_write(client, 0, 0x119); /* set gain on both channels to +3.0 dB */ /* turn off DAC & mic input */
tlv320aic23b_write(client, 8, 0x000); /* set sample rate to 48 kHz */ tlv320aic23b_write(client, 6, 0x00A);
tlv320aic23b_write(client, 9, 0x001); /* activate digital interface */ /* left-justified, 24-bit, master mode */
tlv320aic23b_write(client, 7, 0x049);
/* set gain on both channels to +3.0 dB */
tlv320aic23b_write(client, 0, 0x119);
/* set sample rate to 48 kHz */
tlv320aic23b_write(client, 8, 0x000);
/* activate digital interface */
tlv320aic23b_write(client, 9, 0x001);
return 0; return 0;
} }