sound: soc: tegra: fix compilation errors
Rhyland Klein [Wed, 30 May 2012 18:34:47 +0000 (14:34 -0400)]
Several compilation errors popped up when building the 3.1 kernel for
chrome. Warnings included callback structure changing and not being
updated in the max98095 codec driver and unused labels.

With these change I am able to compile in the max98095 codec support
and wm8903 without build errors.

Bug 986933

Change-Id: Ia8b2511f54b031eadcad8c74efa88be9288f25fb
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Reviewed-on: http://git-master/r/105464
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Scott Peterson <speterson@nvidia.com>

sound/soc/tegra/tegra_max98095.c
sound/soc/tegra/tegra_wm8903.c

index 701571d..d065b78 100644 (file)
@@ -581,6 +581,7 @@ static struct snd_soc_dai_link tegra_max98095_dai[] = {
 };
 
 static int tegra30_soc_set_bias_level(struct snd_soc_card *card,
+                                       struct snd_soc_dapm_context *dapm,
                                        enum snd_soc_bias_level level)
 {
        struct tegra_max98095 *machine = snd_soc_card_get_drvdata(card);
@@ -595,6 +596,7 @@ static int tegra30_soc_set_bias_level(struct snd_soc_card *card,
 }
 
 static int tegra30_soc_set_bias_level_post(struct snd_soc_card *card,
+                                       struct snd_soc_dapm_context *dapm,
                                        enum snd_soc_bias_level level)
 {
        struct tegra_max98095 *machine = snd_soc_card_get_drvdata(card);
@@ -672,8 +674,8 @@ err_unregister_card:
 err_switch_unregister:
 #ifdef CONFIG_SWITCH
        switch_dev_unregister(&wired_switch_dev);
-#endif
 err_fini_utils:
+#endif
        tegra_asoc_utils_fini(&machine->util_data);
 err_free_machine:
        kfree(machine);
index 1475465..063aefe 100644 (file)
@@ -902,8 +902,8 @@ err_unregister_card:
 err_unregister_switch:
 #ifdef CONFIG_SWITCH
        switch_dev_unregister(&tegra_wm8903_headset_switch);
-#endif
 err_fini_utils:
+#endif
        tegra_asoc_utils_fini(&machine->util_data);
 err_free_machine:
        kfree(machine);