lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] soc - corgi - Fix checkpatch warnings

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Mark Brown
2008-04-23 15:12:19 +02:00
committed by Takashi Iwai
parent 0fe564a564
commit 1bfcd36146
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/pxa/corgi.c
View File

@@ -297,21 +297,19 @@ static int corgi_wm8731_init(struct snd_soc_codec *codec)
/* Add corgi specific controls */ /* Add corgi specific controls */
for (i = 0; i < ARRAY_SIZE(wm8731_corgi_controls); i++) { for (i = 0; i < ARRAY_SIZE(wm8731_corgi_controls); i++) {
err = snd_ctl_add(codec->card, err = snd_ctl_add(codec->card,
snd_soc_cnew(&wm8731_corgi_controls[i],codec, NULL)); snd_soc_cnew(&wm8731_corgi_controls[i], codec, NULL));
if (err < 0) if (err < 0)
return err; return err;
} }
/* Add corgi specific widgets */ /* Add corgi specific widgets */
for(i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) { for (i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++)
snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]); snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]);
}
/* Set up corgi specific audio path audio_map */ /* Set up corgi specific audio path audio_map */
for(i = 0; audio_map[i][0] != NULL; i++) { for (i = 0; audio_map[i][0] != NULL; i++)
snd_soc_dapm_connect_input(codec, audio_map[i][0], snd_soc_dapm_connect_input(codec, audio_map[i][0],
audio_map[i][1], audio_map[i][2]); audio_map[i][1], audio_map[i][2]);
}
snd_soc_dapm_sync_endpoints(codec); snd_soc_dapm_sync_endpoints(codec);
return 0; return 0;
@@ -353,7 +351,8 @@ static int __init corgi_init(void)
{ {
int ret; int ret;
if (!(machine_is_corgi() || machine_is_shepherd() || machine_is_husky())) if (!(machine_is_corgi() || machine_is_shepherd() ||
machine_is_husky()))
return -ENODEV; return -ENODEV;
corgi_snd_device = platform_device_alloc("soc-audio", -1); corgi_snd_device = platform_device_alloc("soc-audio", -1);