tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
V4L/DVB (6740): tlv320aic23b: codingstyle cleanups
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
authored by
Hans Verkuil
and committed by
Mauro Carvalho Chehab
574dec61
4c05de9c
+34
-29
+34
-29
drivers/media/video/tlv320aic23b.c
+34
-29
drivers/media/video/tlv320aic23b.c
···
57
57
return -1;
58
58
}
59
59
60
-
for (i = 0; i < 3; i++) {
61
-
if (i2c_smbus_write_byte_data(client, (reg << 1) |
62
-
(val >> 8), val & 0xff) == 0) {
60
+
for (i = 0; i < 3; i++)
61
+
if (i2c_smbus_write_byte_data(client,
62
+
(reg << 1) | (val >> 8), val & 0xff) == 0)
63
63
return 0;
64
-
}
65
-
}
66
64
v4l_err(client, "I2C: cannot write %03x to register R%d\n", val, reg);
67
65
return -1;
68
66
}
69
67
70
-
static int tlv320aic23b_command(struct i2c_client *client, unsigned int cmd,
71
-
void *arg)
68
+
static int tlv320aic23b_command(struct i2c_client *client,
69
+
unsigned int cmd, void *arg)
72
70
{
73
71
struct tlv320aic23b_state *state = i2c_get_clientdata(client);
74
72
struct v4l2_control *ctrl = arg;
75
-
u32* freq = arg;
73
+
u32 *freq = arg;
76
74
77
75
switch (cmd) {
78
76
case VIDIOC_INT_AUDIO_CLOCK_FREQ:
79
77
switch (*freq) {
80
-
case 32000: /* set sample rate to 32 kHz */
81
-
tlv320aic23b_write(client, 8, 0x018);
82
-
break;
83
-
case 44100: /* set sample rate to 44.1 kHz */
84
-
tlv320aic23b_write(client, 8, 0x022);
85
-
break;
86
-
case 48000: /* set sample rate to 48 kHz */
87
-
tlv320aic23b_write(client, 8, 0x000);
88
-
break;
89
-
default:
90
-
return -EINVAL;
78
+
case 32000: /* set sample rate to 32 kHz */
79
+
tlv320aic23b_write(client, 8, 0x018);
80
+
break;
81
+
case 44100: /* set sample rate to 44.1 kHz */
82
+
tlv320aic23b_write(client, 8, 0x022);
83
+
break;
84
+
case 48000: /* set sample rate to 48 kHz */
85
+
tlv320aic23b_write(client, 8, 0x000);
86
+
break;
87
+
default:
88
+
return -EINVAL;
91
89
}
92
90
break;
93
91
···
133
135
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
134
136
return -EIO;
135
137
136
-
v4l_info(client, "chip found @ 0x%x (%s)\n", client->addr << 1, client->adapter->name);
138
+
v4l_info(client, "chip found @ 0x%x (%s)\n",
139
+
client->addr << 1, client->adapter->name);
137
140
138
141
state = kmalloc(sizeof(struct tlv320aic23b_state), GFP_KERNEL);
139
-
if (state == NULL) {
142
+
if (state == NULL)
140
143
return -ENOMEM;
141
-
}
142
144
state->muted = 0;
143
145
i2c_set_clientdata(client, state);
144
146
145
-
/* initialize tlv320aic23b */
146
-
tlv320aic23b_write(client, 15, 0x000); /* RESET */
147
-
tlv320aic23b_write(client, 6, 0x00A); /* turn off DAC & mic input */
148
-
tlv320aic23b_write(client, 7, 0x049); /* left-justified, 24-bit, master mode */
149
-
tlv320aic23b_write(client, 0, 0x119); /* set gain on both channels to +3.0 dB */
150
-
tlv320aic23b_write(client, 8, 0x000); /* set sample rate to 48 kHz */
151
-
tlv320aic23b_write(client, 9, 0x001); /* activate digital interface */
147
+
/* Initialize tlv320aic23b */
148
+
149
+
/* RESET */
150
+
tlv320aic23b_write(client, 15, 0x000);
151
+
/* turn off DAC & mic input */
152
+
tlv320aic23b_write(client, 6, 0x00A);
153
+
/* left-justified, 24-bit, master mode */
154
+
tlv320aic23b_write(client, 7, 0x049);
155
+
/* set gain on both channels to +3.0 dB */
156
+
tlv320aic23b_write(client, 0, 0x119);
157
+
/* set sample rate to 48 kHz */
158
+
tlv320aic23b_write(client, 8, 0x000);
159
+
/* activate digital interface */
160
+
tlv320aic23b_write(client, 9, 0x001);
152
161
return 0;
153
162
}
154
163