Merge branches 'pxa' and 'orion-fixes1'

[linux-2.6-omap-h63xx.git] / sound / soc / pxa / poodle.c

diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 4fbf8bba9627322cd628fb8d21d545ebe608c658..7e830b218943e90090cebddbedd4cc6ec511bba8 100644 (file)
--- 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)
        /* Add poodle specific controls */
        for (i = 0; i < ARRAY_SIZE(wm8731_poodle_controls); i++) {
                err = snd_ctl_add(codec->card,
-                       snd_soc_cnew(&wm8731_poodle_controls[i],codec, NULL));
+                       snd_soc_cnew(&wm8731_poodle_controls[i], codec, NULL));
                if (err < 0)
                        return err;
        }
 
        /* Add poodle 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]);
-       }
 
        /* Set up poodle 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],
                        audio_map[i][1], audio_map[i][2]);
-       }
 
        snd_soc_dapm_sync_endpoints(codec);
        return 0;