aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-04-23 09:13:04 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:43 -0400
commit29e36e49bdb7f24ca7cc0fb980fab2c407a8a2c9 (patch)
tree99acc848b342528fa3cd0d6aac9ceaf1233ecbed /sound/soc/pxa
parent1bfcd361461f25be7d6d180a8da30d02bc124046 (diff)
[ALSA] soc - poodle - Fix checkpatch warnings
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/poodle.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 4fbf8bba9627..7e830b218943 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -257,21 +257,19 @@ static int poodle_wm8731_init(struct snd_soc_codec *codec)
257 /* Add poodle specific controls */ 257 /* Add poodle specific controls */
258 for (i = 0; i < ARRAY_SIZE(wm8731_poodle_controls); i++) { 258 for (i = 0; i < ARRAY_SIZE(wm8731_poodle_controls); i++) {
259 err = snd_ctl_add(codec->card, 259 err = snd_ctl_add(codec->card,
260 snd_soc_cnew(&wm8731_poodle_controls[i],codec, NULL)); 260 snd_soc_cnew(&wm8731_poodle_controls[i], codec, NULL));
261 if (err < 0) 261 if (err < 0)
262 return err; 262 return err;
263 } 263 }
264 264
265 /* Add poodle specific widgets */ 265 /* Add poodle specific widgets */
266 for (i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) { 266 for (i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++)
267 snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]); 267 snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]);
268 }
269 268
270 /* Set up poodle specific audio path audio_map */ 269 /* Set up poodle specific audio path audio_map */
271 for (i = 0; audio_map[i][0] != NULL; i++) { 270 for (i = 0; audio_map[i][0] != NULL; i++)
272 snd_soc_dapm_connect_input(codec, audio_map[i][0], 271 snd_soc_dapm_connect_input(codec, audio_map[i][0],
273 audio_map[i][1], audio_map[i][2]); 272 audio_map[i][1], audio_map[i][2]);
274 }
275 273
276 snd_soc_dapm_sync_endpoints(codec); 274 snd_soc_dapm_sync_endpoints(codec);
277 return 0; 275 return 0;